about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2014-05-07 14:08:57 +0200
committerOndřej Bílka <neleai@seznam.cz>2014-05-07 14:09:24 +0200
commita11892631d92f594c690d0d50a642b0d1aba58b8 (patch)
tree3ff17001b266800cb873d861cdb535d613865d5c
parentce0c5b8f365c73fc647f9a2a43fa988e6f0f46f4 (diff)
downloadglibc-a11892631d92f594c690d0d50a642b0d1aba58b8.tar.gz
glibc-a11892631d92f594c690d0d50a642b0d1aba58b8.tar.xz
glibc-a11892631d92f594c690d0d50a642b0d1aba58b8.zip
Fix typo in nscd/selinux.c
-rw-r--r--ChangeLog3
-rw-r--r--NEWS2
-rw-r--r--nscd/selinux.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7da675cebf..6c50016e7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	[BZ #16876]
 	* nptl/sockperf.c (client): Check socket return value.
+	[BZ #16877]
+	* nscd/selinux.c (nscd_request_avc_has_perm): Check if there is
+	nscd security class.
 
 2014-05-06  Roland McGrath  <roland@hack.frob.com>
 
diff --git a/NEWS b/NEWS
index 6c9328d40c..15ced4d7d5 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Version 2.20
   16677, 16680, 16683, 16689, 16695, 16701, 16706, 16707, 16712, 16713,
   16714, 16731, 16739, 16740, 16743, 16754, 16758, 16759, 16760, 16770,
   16786, 16789, 16791, 16799, 16800, 16815, 16823, 16824, 16831, 16838,
-  16854, 16876, 16885, 16888, 16890, 16912, 16916.
+  16854, 16876, 16877, 16885, 16888, 16890, 16912, 16916.
 
 * The minimum Linux kernel version that this version of the GNU C Library
   can be used with is 2.6.32.
diff --git a/nscd/selinux.c b/nscd/selinux.c
index 9a8a5a86d3..eaed6ddaa2 100644
--- a/nscd/selinux.c
+++ b/nscd/selinux.c
@@ -372,7 +372,7 @@ nscd_request_avc_has_perm (int fd, request_type req)
   /* Get the security class for nscd.  If this fails we will likely be
      unable to do anything unless avc_deny_unknown is 0.  */
   sc_nscd = string_to_security_class ("nscd");
-  if (perm == 0 && avc_deny_unknown == 1)
+  if (sc_nscd == 0 && avc_deny_unknown == 1)
     dbg_log (_("Error getting security class for nscd."));
 
   /* Convert permission to AVC bits.  */