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 b454dc31a0266f4a9e80b2ce7d793c1fac614d37..b9d3a13b1fcc89e9b5dfd9f36f86c16860df5178 100644 (file)
--- 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 3e4d92609efa33b4a44f5e44ed3986317f61763c..ce44f654d7ae16545fa4a8c83de1dbc94192f4a6 100644 (file)
--- 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;
     }