From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 3 Oct 2004 21:33:28 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-glibc-20041004T0747~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48ad81fa2fcabe1a371813d52087e27c30d6e32a;p=thirdparty%2Fglibc.git

Update.

2004-10-03  Juerg Billeter  <j@bitron.ch>

	* nscd/nscd_initgroups.c (__nscd_getgrouplist): Return -1 if nscd
	can't be used.
---

diff --git a/ChangeLog b/ChangeLog
index b454dc31a02..b9d3a13b1fc 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 3e4d92609ef..ce44f654d7a 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;
     }