This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.21-570-g8086966


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  808696696837b8b8fc858f2e6f8d4e40e26e1308 (commit)
       via  61d95397de01ead73b828c6106a4a832d9681652 (commit)
      from  8b59c73386ddb64331ee03c29925a18dae547733 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=808696696837b8b8fc858f2e6f8d4e40e26e1308

commit 808696696837b8b8fc858f2e6f8d4e40e26e1308
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sat May 30 14:55:16 2015 -0400

    nscd: drop selinux/flask.h include
    
    Building nscd w/selinux enabled yields a warning which yields an error:
    In file included from selinux.c:32:0:
    /usr/include/selinux/flask.h:5:2: error:
     #warning "Please remove any #include's of this header in your source code."
    
    I've done just that and it builds cleanly with libselinux-2.4.

diff --git a/ChangeLog b/ChangeLog
index cb44762..3a5cfee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-07-08  Mike Frysinger  <vapier@gentoo.org>
 
+	* nscd/selinux.c: Delete selinux/flask.h include.
+
+2015-07-08  Mike Frysinger  <vapier@gentoo.org>
+
 	[BZ #18641]
 	* pwd/pwd.h (fgetpwent): Add __nonnull markings.
 	(putpwent): Likewise.
diff --git a/nscd/selinux.c b/nscd/selinux.c
index e433b1b..806763f 100644
--- a/nscd/selinux.c
+++ b/nscd/selinux.c
@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <sys/prctl.h>
 #include <selinux/avc.h>
-#include <selinux/flask.h>
 #include <selinux/selinux.h>
 #ifdef HAVE_LIBAUDIT
 # include <libaudit.h>

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=61d95397de01ead73b828c6106a4a832d9681652

commit 61d95397de01ead73b828c6106a4a832d9681652
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sat May 30 13:33:22 2015 -0400

    pwd.h: add __nonnull markings [BZ #18641]
    
    Mark all the functions that don't handle NULL pointers as __nonnull.
    POSIX does not require either behavior, so the prototypes should match
    the reality of the codebase.

diff --git a/ChangeLog b/ChangeLog
index 86a3144..cb44762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-07-08  Mike Frysinger  <vapier@gentoo.org>
+
+	[BZ #18641]
+	* pwd/pwd.h (fgetpwent): Add __nonnull markings.
+	(putpwent): Likewise.
+	(getpwnam): Likewise.
+	(getpwent_r): Likewise.
+	(getpwuid_r): Likewise.
+	(getpwnam_r): Likewise.
+	(fgetpwent_r): Likewise.
+
 2015-06-18  Carlos O'Donell  <carlos@redhat.com>
 
 	[BZ #18557]
diff --git a/NEWS b/NEWS
index c316cab..39d3140 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@ Version 2.22
   18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532, 18533, 18534,
   18536, 18539, 18540, 18542, 18544, 18545, 18546, 18547, 18549, 18553,
   18557, 18558, 18569, 18583, 18585, 18586, 18592, 18593, 18594, 18602,
-  18612, 18613, 18619, 18633.
+  18612, 18613, 18619, 18633, 18641.
 
 * Cache information can be queried via sysconf() function on s390 e.g. with
   _SC_LEVEL1_ICACHE_SIZE as argument.
diff --git a/pwd/pwd.h b/pwd/pwd.h
index ff49564..fcfb2ab 100644
--- a/pwd/pwd.h
+++ b/pwd/pwd.h
@@ -91,7 +91,7 @@ extern struct passwd *getpwent (void);
    cancellation point.  But due to similarity with an POSIX interface
    or due to the implementation it is a cancellation point and
    therefore not marked with __THROW.  */
-extern struct passwd *fgetpwent (FILE *__stream);
+extern struct passwd *fgetpwent (FILE *__stream) __nonnull ((1));
 
 /* Write the given entry onto the given stream.
 
@@ -100,7 +100,7 @@ extern struct passwd *fgetpwent (FILE *__stream);
    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);
+		     FILE *__restrict __f) __nonnull ((1, 2));
 #endif
 
 /* Search for an entry with a matching user ID.
@@ -113,7 +113,7 @@ extern struct passwd *getpwuid (__uid_t __uid);
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
-extern struct passwd *getpwnam (const char *__name);
+extern struct passwd *getpwnam (const char *__name) __nonnull ((1));
 
 #ifdef __USE_POSIX
 
@@ -138,18 +138,21 @@ extern struct passwd *getpwnam (const char *__name);
    therefore not marked with __THROW.  */
 extern int getpwent_r (struct passwd *__restrict __resultbuf,
 		       char *__restrict __buffer, size_t __buflen,
-		       struct passwd **__restrict __result);
+		       struct passwd **__restrict __result)
+		       __nonnull ((1, 2, 4));
 # endif
 
 extern int getpwuid_r (__uid_t __uid,
 		       struct passwd *__restrict __resultbuf,
 		       char *__restrict __buffer, size_t __buflen,
-		       struct passwd **__restrict __result);
+		       struct passwd **__restrict __result)
+		       __nonnull ((2, 3, 5));
 
 extern int getpwnam_r (const char *__restrict __name,
 		       struct passwd *__restrict __resultbuf,
 		       char *__restrict __buffer, size_t __buflen,
-		       struct passwd **__restrict __result);
+		       struct passwd **__restrict __result)
+		       __nonnull ((1, 2, 3, 5));
 
 
 # ifdef	__USE_MISC
@@ -163,7 +166,8 @@ extern int getpwnam_r (const char *__restrict __name,
 extern int fgetpwent_r (FILE *__restrict __stream,
 			struct passwd *__restrict __resultbuf,
 			char *__restrict __buffer, size_t __buflen,
-			struct passwd **__restrict __result);
+			struct passwd **__restrict __result)
+			__nonnull ((1, 2, 3, 5));
 # endif
 
 #endif	/* POSIX or reentrant */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |   15 +++++++++++++++
 NEWS           |    2 +-
 nscd/selinux.c |    1 -
 pwd/pwd.h      |   18 +++++++++++-------
 4 files changed, 27 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]