[commits] r13709 - in /fsf/trunk/libc: ChangeLog NEWS nss/nss_files/files-initgroups.c resolv/netdb.h sunrpc/Makefile

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat May  7 00:03:49 2011
New Revision: 13709

Log:
Import glibc-mainline for 2011-05-07

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/nss/nss_files/files-initgroups.c
    fsf/trunk/libc/resolv/netdb.h
    fsf/trunk/libc/sunrpc/Makefile

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat May  7 00:03:49 2011
@@ -1,3 +1,14 @@
+2011-05-06  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn): Return
+	NSS_STATUS_NOTFOUND if no record was found.
+
+2011-05-05  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sunrpc/Makefile (headers): Add rpc/netdb.h.
+	(headers-not-in-tirpc): Remove rpc/netdb.h
+	* resolv/netdb.h: Revert last change.
+
 2011-05-05  Paul Pluzhnikov  <ppluzhnikov@xxxxxxxxxx>
 
 	* Makeconfig (link-libc-static): Use --{start,end}-group to handle

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sat May  7 00:03:49 2011
@@ -13,9 +13,8 @@
   The TI-RPC implemtation is IPv6 enabled and there are other benefits.
 
   Visible changes of this change include (obviously) the inability to link
-  programs using RPC functions without referencing the TI-RPC library, the
-  removal of the RPC headers from the glibc headers, and the lack of
-  symbols defined in <rpc/netdb.h> when <netdb.h> is installed.
+  programs using RPC functions without referencing the TI-RPC library and the
+  removal of the RPC headers from the glibc headers.
   Implemented by Ulrich Drepper.
 
 * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,

Modified: fsf/trunk/libc/nss/nss_files/files-initgroups.c
==============================================================================
--- fsf/trunk/libc/nss/nss_files/files-initgroups.c (original)
+++ fsf/trunk/libc/nss/nss_files/files-initgroups.c Sat May  7 00:03:49 2011
@@ -43,6 +43,7 @@
   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 @@
 
 	      groups[*start] = grp.gr_gid;
 	      *start += 1;
+	      any = true;
 
 	      break;
 	    }
@@ -131,5 +133,5 @@
 
   fclose (stream);
 
-  return status;
+  return status == NSS_STATUS_SUCCESS && !any ? NSS_STATUS_NOTFOUND : status;
 }

Modified: fsf/trunk/libc/resolv/netdb.h
==============================================================================
--- fsf/trunk/libc/resolv/netdb.h (original)
+++ fsf/trunk/libc/resolv/netdb.h Sat May  7 00:03:49 2011
@@ -27,6 +27,11 @@
 
 #include <netinet/in.h>
 #include <stdint.h>
+#ifdef __USE_MISC
+/* This is necessary to make this include file properly replace the
+   Sun version.  */
+# include <rpc/netdb.h>
+#endif
 
 #ifdef __USE_GNU
 # define __need_sigevent_t

Modified: fsf/trunk/libc/sunrpc/Makefile
==============================================================================
--- fsf/trunk/libc/sunrpc/Makefile (original)
+++ fsf/trunk/libc/sunrpc/Makefile Sat May  7 00:03:49 2011
@@ -47,12 +47,13 @@
 rpcsvc = bootparam_prot.x nlm_prot.x rstat.x \
 	 yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
 	 rusers.x spray.x nfs_prot.x rquota.x key_prot.x
-headers_in_tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
+headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
 				    pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h \
 				    svc.h svc_auth.h types.h xdr.h auth_des.h \
 				    des_crypt.h)
-headers_not_in_tirpc = $(addprefix rpc/,netdb.h key_prot.h rpc_des.h) \
+headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
+headers = rpc/netdb.h
 install-others = $(inst_sysconfdir)/rpc
 generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
@@ -87,7 +88,7 @@
 	      rpc_tblout.o rpc_sample.o
 # These headers are part of rpcgen.
 distribute := proto.h rpc_util.h rpc_parse.h rpc_scan.h \
-	      $(headers_in_tirpc) $(headers_not_in_tirpc) \
+	      $(headers-in-tirpc) $(headers-not-in-tirpc) \
 	      $(rpcgen-objs:.o=.c) etc.rpc \
 	      errqueue.h
 extra-objs = $(rpcgen-objs)