* 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.

6 files changed, 286 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e6d92a9312..32e8b62766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* 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  <dan@codesourcery.com>
 
 	* 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  <drepper@redhat.com>
+
+	* SUPPORTED (SUPPORTED-LOCALES): Add bo_CN and bo_IN.
+	* locales/bo_CN: New file.
+	* locales/bo_IN: New file.
+
 2007-10-28  Ulrich Drepper  <drepper@redhat.com>
 
 	[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   "<U0F49><U0F72><U0F0B>";/
+        "<U0F5F><U0FB3><U0F0B>";/
+        "<U0F58><U0F72><U0F62><U0F0B>";/
+        "<U0F63><U0FB7><U0F42><U0F0B>";/
+        "<U0F54><U0F74><U0F62><U0F0B>";/
+        "<U0F66><U0F44><U0F66><U0F0B>";/
+        "<U0F66><U0FA4><U0F7A><U0F53><U0F0B>"
+
+day     "<U0F42><U0F5F><U0F60><U0F0B><U0F49><U0F72><U0F0B><U0F58><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F5F><U0FB3><U0F0B><U0F56><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F58><U0F72><U0F42><U0F0B><U0F51><U0F58><U0F62><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F63><U0FB7><U0F42><U0F0B><U0F55><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F54><U0F74><U0F62><U0F0B><U0F56><U0F74><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F54><U0F0B><U0F66><U0F44><U0F66><U0F0B>";/
+        "<U0F42><U0F5F><U0F60><U0F0B><U0F66><U0FA4><U0F7A><U0F53><U0F0B><U0F55><U0F0B>"
+
+abmon   "<U0F5F><U0FB3><U0F0B><U0F21>";/
+	"<U0F5F><U0FB3><U0F0B><U0F22>";/
+	"<U0F5F><U0FB3><U0F0B><U0F23>";/
+	"<U0F5F><U0FB3><U0F0B><U0F24>";/
+	"<U0F5F><U0FB3><U0F0B><U0F25>";/
+	"<U0F5F><U0FB3><U0F0B><U0F26>";/
+	"<U0F5F><U0FB3><U0F0B><U0F27>";/
+	"<U0F5F><U0FB3><U0F0B><U0F28>";/
+	"<U0F5F><U0FB3><U0F0B><U0F29>";/
+	"<U0F5F><U0FB3><U0F0B><U0F21><U0F20>";/
+	"<U0F5F><U0FB3><U0F0B><U0F21><U0F21>";/
+	"<U0F5F><U0FB3><U0F0B><U0F21><U0F22>"
+
+mon      "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0F44><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F42><U0F49><U0F72><U0F66><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F42><U0F66><U0F74><U0F58><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F5E><U0F72><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F63><U0F94><U0F0B><U0F55><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0FB2><U0F74><U0F42><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F51><U0F74><U0F53><U0F54><U0F0B>";/
+    "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F62><U0F92><U0FB1><U0F51><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0F42><U0F74><U0F0B><U0F54><U0F0B>";/
+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F45><U0F74><U0F0B><U0F54><U0F0B>";/
+"<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F45><U0F74><U0F0B><U0F42><U0F45><U0F72><U0F42><U0F0B><U0F54><U0F0B>";/
+"<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F45><U0F74><U0F0B><U0F42><U0F49><U0F72><U0F66><U0F0B><U0F54><U0F0B>"
+
+
+
+
+% Appropriate date & time representation
+d_t_fmt      "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C><U0025><U0079><U0F5F><U0F63><U0025><U006D><U0F5A><U0F7A><U0F66>/
+<U0025><U0064><U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51><U0025><U0048><U0F40><U0F66><U0F62><U0F0B><U0F58>/
+<U0025><U004D><U0F40><U0F66><U0F62><U0F0B><U0F46><U0025><U0053>"
+
+% Appropriate date representation
+d_fmt        "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C><U0025><U0079>/
+<U0F5F><U0F63><U0025><U006D><U0F5A><U0F7A><U0F66><U0025><U0064>"
+
+% Appropriate time representation  "%H:%M:%S"
+t_fmt        "<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>/
+<U0025><U0048><U0F40><U0F66><U0F62><U0F0B><U0F58>/
+<U0025><U004D><U0F40><U0F66><U0F62><U0F0B><U0F46><U0025><U0053>"
+
+% AM/PM signs
+am_pm   "<U0F44><U0F66><U0F0B><U0F46>";"<U0F55><U0FB1><U0F72><U0F0B><U0F46>"
+
+% Appropriate 12-hour clock representation  "%I:%M:%S %p"
+t_fmt_ampm        "<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>/
+<U0025><U0049><U0F40><U0F66><U0F62><U0F0B><U0F58>/
+<U0025><U004D><U0F40><U0F66><U0F62><U0F0B><U0F46><U0025><U0053><U0020>/
+<U0025><U0070>"
+
+
+END LC_TIME
+
+LC_MESSAGES
+yesstr  "<U0F68><U0F72><U0F53>"
+nostr   "<U0F58><U0F7A><U0F53>"
+yesexpr "<U005E><U005B><U0F68><U0059><U0079><U005D><U002E><U002A>"
+noexpr  "<U005E><U005B><U0F58><U004E><U006E><U005D><U002E><U002A>"
+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	"<U0043><U004E>"
+country_ab3	"<U0043><U0048><U004E>"
+country_num	156
+%country_car	"FIXME"
+country_isbn	"<U0037>"
+
+lang_name     "<U0F54><U0F7C><U0F51><U0F0B><U0F66><U0F90><U0F51><U0F0B>"
+lang_ab       "<U0062><U006F>"
+lang_term     "<U0062><U006F><U0064>"
+lang_lib      "<U0074><U0069><U0062>"
+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 "<U0049><U004E>"
+country_ab3 "<U0049><U004E><U0044>"
+country_num 356
+
+lang_name     "<U0F54><U0F7C><U0F51><U0F0B><U0F66><U0F90><U0F51><U0F0B>"
+lang_ab       "<U0062><U006F>"
+lang_term     "<U0062><U006F><U0064>"
+lang_lib      "<U0074><U0069><U0062>"
+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: