about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-01-15 22:21:52 +0000
committerUlrich Drepper <drepper@redhat.com>2007-01-15 22:21:52 +0000
commit49ee6d7965c914b16ddc73471e5cde3aea65d3e1 (patch)
treed675a54401fc53a83338623eef4e1a4f007fbda7
parent4e35ef2c710dfefe96a491d133b5a53414e9a5c2 (diff)
downloadglibc-49ee6d7965c914b16ddc73471e5cde3aea65d3e1.tar.gz
glibc-49ee6d7965c914b16ddc73471e5cde3aea65d3e1.tar.xz
glibc-49ee6d7965c914b16ddc73471e5cde3aea65d3e1.zip
* nscd/connections.c (handle_request): Fix thinko in selinux test
	invocation.
-rw-r--r--ChangeLog3
-rw-r--r--nscd/connections.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d60391f85..a96467a59b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-01-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* nscd/connections.c (handle_request): Fix thinko in selinux test
+	invocation.
+
 	* sysdeps/generic/ldsodefs.h: Define DL_LOOKUP_SCOPE_LOCK.
 	* elf/dl-lookup.c (add_dependency): If scope map is locked, unlock
 	it before getting dl_load_lock and then relock.
diff --git a/nscd/connections.c b/nscd/connections.c
index a5e758e071..97287bc7ab 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -939,7 +939,6 @@ cannot handle old request version %d; current version is %d"),
   if (selinux_enabled
       && __builtin_expect (req->type >= GETPWBYNAME, 1)
       && __builtin_expect (req->type < LASTREQ, 1)
-      && __builtin_expect (req->type < SHUTDOWN || req->type > INVALIDATE, 1)
       && nscd_request_avc_has_perm (fd, req->type) != 0)
     return;