about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-10-03 21:33:28 +0000
committerUlrich Drepper <drepper@redhat.com>2004-10-03 21:33:28 +0000
commit48ad81fa2fcabe1a371813d52087e27c30d6e32a (patch)
tree4a91164cea6fc2c40d9bb66ee957649c3bcc47ee
parent27e828564328ee5270450729bbb6902f6f62ba47 (diff)
downloadglibc-48ad81fa2fcabe1a371813d52087e27c30d6e32a.tar.gz
glibc-48ad81fa2fcabe1a371813d52087e27c30d6e32a.tar.xz
glibc-48ad81fa2fcabe1a371813d52087e27c30d6e32a.zip
Update.
2004-10-03  Juerg Billeter  <j@bitron.ch>

	* nscd/nscd_initgroups.c (__nscd_getgrouplist): Return -1 if nscd
	can't be used.
-rw-r--r--ChangeLog5
-rw-r--r--nscd/nscd_initgroups.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b454dc31a0..b9d3a13b1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-03  Juerg Billeter  <j@bitron.ch>
+
+	* nscd/nscd_initgroups.c (__nscd_getgrouplist): Return -1 if nscd
+	can't be used.
+
 2004-10-03  Ulrich Drepper  <drepper@redhat.com>
 
 	Dynamically create new threads if necessary.
diff --git a/nscd/nscd_initgroups.c b/nscd/nscd_initgroups.c
index 3e4d92609e..ce44f654d7 100644
--- a/nscd/nscd_initgroups.c
+++ b/nscd/nscd_initgroups.c
@@ -81,8 +81,11 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size,
       sock = __nscd_open_socket (user, userlen, INITGROUPS, &initgr_resp_mem,
 				 sizeof (initgr_resp_mem));
       if (sock == -1)
-	/* nscd not running or wrong version or hosts caching disabled.  */
-	__nss_not_use_nscd_group = 1;
+	{
+	  /* nscd not running or wrong version or hosts caching disabled.  */
+	  __nss_not_use_nscd_group = 1;
+	  goto out;
+	}
 
       initgr_resp = &initgr_resp_mem;
     }