Author: aurel32
Date: 2011-05-08 21:38:48 +0000 (Sun, 08 May 2011)
New Revision: 4647
Removed:
glibc-package/trunk/debian/patches/any/cvs-nss-initgroups.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
Revert r4644
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-05-08 21:33:20 UTC (rev
4646)
+++ glibc-package/trunk/debian/changelog 2011-05-08 21:38:48 UTC (rev
4647)
@@ -8,8 +8,6 @@
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.
* Add support for the new armhf triplet (Closes: #625846):
- Update patches/any/submitted-autotools.diff to detect the new triplet.
- Add patches/arm/submitted-armhf-triplet.diff to support the
Deleted: glibc-package/trunk/debian/patches/any/cvs-nss-initgroups.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-nss-initgroups.diff
2011-05-08 21:33:20 UTC (rev 4646)
+++ glibc-package/trunk/debian/patches/any/cvs-nss-initgroups.diff
2011-05-08 21:38:48 UTC (rev 4647)
@@ -1,32 +0,0 @@
-2011-05-06 Ulrich Drepper <[email protected]>
-
- * 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 21:33:20 UTC (rev
4646)
+++ glibc-package/trunk/debian/patches/series 2011-05-08 21:38:48 UTC (rev
4647)
@@ -251,4 +251,3 @@
any/local-dl-deps.diff
any/cvs-resolv-tld.diff
any/cvs-sys-param-ARG_MAX.diff
-any/cvs-nss-initgroups.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
