From 7fe4e0e892dad84aaf383bc130f4909f9b4b380d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 6 Nov 2007 18:26:44 +0000 Subject: [PATCH] * nscd/selinux.c (nscd_request_avc_has_perm): When compiled with old headers, don't call avc_has_perm if we don't have the permission information. --- ChangeLog | 6 ++ localedata/ChangeLog | 6 ++ localedata/SUPPORTED | 2 + localedata/locales/bo_CN | 170 +++++++++++++++++++++++++++++++++++++++++++++++ localedata/locales/bo_IN | 94 ++++++++++++++++++++++++++ nscd/selinux.c | 8 +++ 6 files changed, 286 insertions(+) create mode 100644 localedata/locales/bo_CN create mode 100644 localedata/locales/bo_IN diff --git a/ChangeLog b/ChangeLog index e6d92a9312..32e8b62766 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-06 Ulrich Drepper + + * nscd/selinux.c (nscd_request_avc_has_perm): When compiled with + old headers, don't call avc_has_perm if we don't have the + permission information. + 2007-11-05 Daniel Jacobowitz * elf/rtld.c (dl_main): Use the page size to find the map start. diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 457d52cfa3..9daf7239d3 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2007-11-06 Ulrich Drepper + + * SUPPORTED (SUPPORTED-LOCALES): Add bo_CN and bo_IN. + * locales/bo_CN: New file. + * locales/bo_IN: New file. + 2007-10-28 Ulrich Drepper [BZ #5224] diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 51aeeb1c01..239194b28d 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -59,6 +59,8 @@ bg_BG.UTF-8/UTF-8 \ bg_BG/CP1251 \ bn_BD/UTF-8 \ bn_IN/UTF-8 \ +bo_CN/UTF-8 \ +bo_IN/UTF-8 \ br_FR.UTF-8/UTF-8 \ br_FR/ISO-8859-1 \ br_FR@euro/ISO-8859-15 \ diff --git a/localedata/locales/bo_CN b/localedata/locales/bo_CN new file mode 100644 index 0000000000..8440506f21 --- /dev/null +++ b/localedata/locales/bo_CN @@ -0,0 +1,170 @@ +comment_char % +escape_char / + +% Tibetan language locale for P.R. of China +% +% Based on dz_BT by Pema Geyleg + +LC_IDENTIFICATION +title "Tibetan language locale for P.R. of China" +source "" +address "" +contact "" +email "bug-glibc@gnu.org" +tel "" +fax "" +language "Tibetan" +territory "P.R. of China" +revision "0.1" +date "2007-11-06" +% +category "bo_CN:2007";LC_IDENTIFICATION +category "bo_CN:2007";LC_CTYPE +category "bo_CN:2007";LC_COLLATE +category "bo_CN:2007";LC_NUMERIC +category "bo_CN:2007";LC_MONETARY +category "bo_CN:2007";LC_MESSAGES +category "bo_CN:2007";LC_PAPER +category "bo_CN:2007";LC_NAME +category "bo_CN:2007";LC_ADDRESS +category "bo_CN:2007";LC_TELEPHONE + +END LC_IDENTIFICATION + +LC_CTYPE +copy "i18n" + +translit_start +include "translit_combining";"" +translit_end +END LC_CTYPE + +LC_COLLATE +copy "dz_BT" +END LC_COLLATE + +LC_MONETARY +copy "zh_CN" +END LC_MONETARY + +LC_NUMERIC +copy "zh_CN" +END LC_NUMERIC + +LC_TIME +abday "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" + +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" + +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" + +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ +"";/ +"" + + + + +% Appropriate date & time representation +d_t_fmt "/ +/ +" + +% Appropriate date representation +d_fmt "/ +" + +% Appropriate time representation "%H:%M:%S" +t_fmt "/ +/ +" + +% AM/PM signs +am_pm "";"" + +% Appropriate 12-hour clock representation "%I:%M:%S %p" +t_fmt_ampm "/ +/ +/ +" + + +END LC_TIME + +LC_MESSAGES +yesstr "" +nostr "" +yesexpr "" +noexpr "" +END LC_MESSAGES + +LC_TELEPHONE +copy "zh_CN" +END LC_TELEPHONE + +LC_PAPER +copy "zh_CN" +END LC_PAPER + +LC_MEASUREMENT +copy "zh_CN" +END LC_MEASUREMENT + +LC_NAME +% FIXME +name_fmt "FIXME" +name_gen "FIXME" +name_miss "FIXME" +name_mr "FIXME" +name_mrs "FIXME" +name_ms "FIXME" +END LC_NAME + +LC_ADDRESS +% FIXME +postal_fmt "FIXME" +country_name "FIXME" + +country_ab2 "" +country_ab3 "" +country_num 156 +%country_car "FIXME" +country_isbn "" + +lang_name "" +lang_ab "" +lang_term "" +lang_lib "" +END LC_ADDRESS diff --git a/localedata/locales/bo_IN b/localedata/locales/bo_IN new file mode 100644 index 0000000000..724e286cf1 --- /dev/null +++ b/localedata/locales/bo_IN @@ -0,0 +1,94 @@ +comment_char % +escape_char / + +% Tibetan language locale for India +% +% Based on dz_BT by Pema Geyleg + +LC_IDENTIFICATION +title "Tibetan language locale for India" +source "" +address "" +contact "" +email "bug-glibc@gnu.org" +tel "" +fax "" +language "Tibetan" +territory "India" +revision "0.1" +date "2007-11-06" +% +category "bo_IN:2007";LC_IDENTIFICATION +category "bo_IN:2007";LC_CTYPE +category "bo_IN:2007";LC_COLLATE +category "bo_IN:2007";LC_NUMERIC +category "bo_IN:2007";LC_MONETARY +category "bo_IN:2007";LC_MESSAGES +category "bo_IN:2007";LC_PAPER +category "bo_IN:2007";LC_NAME +category "bo_IN:2007";LC_ADDRESS +category "bo_IN:2007";LC_TELEPHONE + +END LC_IDENTIFICATION + +LC_CTYPE +copy "bo_CN" +END LC_CTYPE + +LC_COLLATE +copy "bo_CN" +END LC_COLLATE + +LC_MONETARY +copy "hi_IN" +END LC_MONETARY + +LC_NUMERIC +% FIXME: check that grouping etc is correct +copy "bo_CN" +END LC_NUMERIC + +LC_TIME +copy "bo_CN" +END LC_TIME + +LC_MESSAGES +copy "bo_CN" +END LC_MESSAGES + +LC_TELEPHONE +copy "hi_IN" +END LC_TELEPHONE + +LC_PAPER +copy "hi_IN" +END LC_PAPER + +LC_MEASUREMENT +copy "hi_IN" +END LC_MEASUREMENT + +LC_NAME +% FIXME +name_fmt "FIXME" +name_gen "FIXME" +name_miss "FIXME" +name_mr "FIXME" +name_mrs "FIXME" +name_ms "FIXME" +END LC_NAME + +LC_ADDRESS +% FIXME +postal_fmt "FIXME" +country_name "FIXME" + +country_ab2 "" +country_ab3 "" +country_num 356 + +lang_name "" +lang_ab "" +lang_term "" +lang_lib "" +END LC_ADDRESS diff --git a/nscd/selinux.c b/nscd/selinux.c index 6cbcbea19c..9a167ec14d 100644 --- a/nscd/selinux.c +++ b/nscd/selinux.c @@ -368,6 +368,14 @@ nscd_request_avc_has_perm (int fd, request_type req) goto out; } +#ifndef NSCD__GETSERV + if (perms[req] == 0) + { + dbg_log (_("compile-time support for database policy missing")); + goto out; + } +#endif + rc = avc_has_perm (ssid, tsid, SECCLASS_NSCD, perms[req], &aeref, NULL) < 0; out: -- 2.11.4.GIT