about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--pwd/pwd.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0498847a52..cf1efcce19 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 fcfb2ab0e7..70a051deb1 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.