From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 28 Jul 2015 03:43:09 +0000 (-0400)
Subject: pwd.h: revert __nonnull markings on putpwent [BZ #18641]
X-Git-Tag: glibc-2.22~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eb8bf804937bea53f5e8cfa2f84d256373cdb64;p=thirdparty%2Fglibc.git

pwd.h: revert __nonnull markings on putpwent [BZ #18641]

This function actually checks for NULL arguments and the API has been
tenatively documented as using EINVAL in that case.  We can debate
leaving it this way, but it should be done after the pending release.
---

diff --git a/ChangeLog b/ChangeLog
index 0498847a52f..cf1efcce19e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-27  Mike Frysinger  <vapier@gentoo.org>
+
+	[BZ #18641]
+	* pwd/pwd.h (putpwent): Delete __nonnull markings.
+
 2015-07-27  Andreas Schwab  <schwab@suse.de>
 
 	* conform/conformtest.pl (checknamespace): Filter out string
diff --git a/pwd/pwd.h b/pwd/pwd.h
index fcfb2ab0e7b..70a051deb16 100644
--- a/pwd/pwd.h
+++ b/pwd/pwd.h
@@ -100,7 +100,7 @@ extern struct passwd *fgetpwent (FILE *__stream) __nonnull ((1));
    or due to the implementation it is a cancellation point and
    therefore not marked with __THROW.  */
 extern int putpwent (const struct passwd *__restrict __p,
-		     FILE *__restrict __f) __nonnull ((1, 2));
+		     FILE *__restrict __f);
 #endif
 
 /* Search for an entry with a matching user ID.