Fix typo in nscd/selinux.c

diff --git a/ChangeLog b/ChangeLog
index 7da675cebf6084ae4e2524acdea831411e425812..6c50016e7a31811161b128064efe9e0a7998fc77 100644 (file)
--- 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 6c9328d40c04690c2b4bfaf011026d8677659d31..15ced4d7d5975e6703600d9d2f0ad41b3907c2b7 100644 (file)
--- 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 9a8a5a86d39d2ebc4ad74f67d86b6b9117809623..eaed6ddaa23b9a4d1cd7cb41f1906fea40abc357 100644 (file)
--- 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.  */