r4644 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2011-05-08 19:20:31 +0000 (Sun, 08 May 2011)
New Revision: 4644
Added:
glibc-package/trunk/debian/patches/any/cvs-nss-initgroups.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add patches/any/cvs-nss-initgroups.diff from upstream to correctly
return NSS_STATUS_NOTFOUND if no record was found.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-05-08 18:49:52 UTC (rev 4643)
+++ glibc-package/trunk/debian/changelog 2011-05-08 19:20:31 UTC (rev 4644)
@@ -6,6 +6,8 @@
of unqualified domain names.
* Add patches/any/cvs-sys-param-ARG_MAX.diff from upstream to fix
bassackwards tests for ARG_MAX in sys/param.h. Closes: #583433.
+ * Add patches/any/cvs-nss-initgroups.diff from upstream to correctly
+ return NSS_STATUS_NOTFOUND if no record was found.
-- Aurelien Jarno <aurel32@debian.org> Wed, 04 May 2011 19:53:33 +0200
Added: glibc-package/trunk/debian/patches/any/cvs-nss-initgroups.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-nss-initgroups.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-nss-initgroups.diff 2011-05-08 19:20:31 UTC (rev 4644)
@@ -0,0 +1,32 @@
+2011-05-06 Ulrich Drepper <drepper@gmail.com>
+
+ * nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn): Return
+ NSS_STATUS_NOTFOUND if no record was found.
+
+diff --git a/nss/nss_files/files-initgroups.c b/nss/nss_files/files-initgroups.c
+index 4c7b9f8..113abf2 100644
+--- a/nss/nss_files/files-initgroups.c
++++ b/nss/nss_files/files-initgroups.c
+@@ -43,6 +43,7 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
+ char *line = NULL;
+ size_t linelen = 0;
+ enum nss_status status = NSS_STATUS_SUCCESS;
++ bool any = false;
+
+ size_t buflen = 1024;
+ void *buffer = alloca (buflen);
+@@ -118,6 +119,7 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
+
+ groups[*start] = grp.gr_gid;
+ *start += 1;
++ any = true;
+
+ break;
+ }
+@@ -131,5 +133,5 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
+
+ fclose (stream);
+
+- return status;
++ return status == NSS_STATUS_SUCCESS && !any ? NSS_STATUS_NOTFOUND : status;
+ }
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-05-08 18:49:52 UTC (rev 4643)
+++ glibc-package/trunk/debian/patches/series 2011-05-08 19:20:31 UTC (rev 4644)
@@ -250,3 +250,4 @@
any/local-dl-deps.diff
any/cvs-resolv-tld.diff
any/cvs-sys-param-ARG_MAX.diff
+any/cvs-nss-initgroups.diff
Reply to: