[Commits] r23847 - in /fsf/trunk/libc: ./ io/ nis/nss_nis/ nscd/ nss/nss_files/ stdlib/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Aug 27 00:01:56 2013
New Revision: 23847

Log:
Import glibc-mainline for 2013-08-27

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/io/lxstat64.c
    fsf/trunk/libc/nis/nss_nis/nis-publickey.c
    fsf/trunk/libc/nscd/aicache.c
    fsf/trunk/libc/nss/nss_files/files-key.c
    fsf/trunk/libc/stdlib/Makefile

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Aug 27 00:01:56 2013
@@ -1,3 +1,26 @@
+2013-08-26  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* io/lxstat64.c: Just call __xstat64, for parity with stub __lxstat.
+
+	* nss/nss_files/files-key.c: Include <rpc/des_crypt.h>
+	instead of explicitly declaring xdecrypt.
+	* nis/nss_nis/nis-publickey.c: Likewise.
+
+2013-08-26  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	[BZ #15890]
+	* nscd/aicache.c: Include res_hconf.h.
+	(addhstaiX): Initialize res_hconf.
+
+2013-08-26  Andreas Schwab  <schwab@xxxxxxx>
+
+	* stdlib/Makefile (LDFLAGS-tst-tls-atexit): Remove.
+	($(objpfx)tst-tls-atexit): Add dependencies here instead.
+
+2013-08-26  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* nscd/aicache.c (addhstaiX): Fix indentation.
+
 2013-08-25  Mike Frysinger  <vapier@xxxxxxxxxx>
 
 	* configure.ac: Quote $build_pt_chown test.

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Tue Aug 27 00:01:56 2013
@@ -9,7 +9,7 @@
 
 * The following bugs are resolved with this release:
 
-  14699, 15531, 15532, 15749, 15797, 15867
+  14699, 15531, 15532, 15749, 15797, 15867, 15890
 
 * CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
   to the d_name member of struct dirent, or omit the terminating NUL

Modified: fsf/trunk/libc/io/lxstat64.c
==============================================================================
--- fsf/trunk/libc/io/lxstat64.c (original)
+++ fsf/trunk/libc/io/lxstat64.c Tue Aug 27 00:01:56 2013
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* lxstat64 -- get file metadata, not following symlinks.  Stub version.
+   Copyright (C) 1991-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -24,14 +25,6 @@
 int
 __lxstat64 (int vers, const char *file, struct stat64 *buf)
 {
-  if (vers != _STAT_VER || file == NULL || buf == NULL)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  __set_errno (ENOSYS);
-  return -1;
+  return __xstat64 (vers, file, buf);
 }
 hidden_def (__lxstat64)
-stub_warning (__lxstat64)

Modified: fsf/trunk/libc/nis/nss_nis/nis-publickey.c
==============================================================================
--- fsf/trunk/libc/nis/nss_nis/nis-publickey.c (original)
+++ fsf/trunk/libc/nis/nss_nis/nis-publickey.c Tue Aug 27 00:01:56 2013
@@ -25,7 +25,7 @@
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 #include <rpc/key_prot.h>
-extern int xdecrypt (char *, char *);
+#include <rpc/des_crypt.h>
 
 #include "nss-nis.h"
 

Modified: fsf/trunk/libc/nscd/aicache.c
==============================================================================
--- fsf/trunk/libc/nscd/aicache.c (original)
+++ fsf/trunk/libc/nscd/aicache.c Tue Aug 27 00:01:56 2013
@@ -25,6 +25,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/mman.h>
+#include <resolv/res_hconf.h>
 
 #include "dbg_log.h"
 #include "nscd.h"
@@ -100,8 +101,11 @@
     no_more = __nss_database_lookup ("hosts", NULL,
 				     "dns [!UNAVAIL=return] files", &nip);
 
+  /* Initialize configurations.  */
+  if (__builtin_expect (!_res_hconf.initialized, 0))
+    _res_hconf_init ();
   if (__res_maybe_init (&_res, 0) == -1)
-	    no_more = 1;
+    no_more = 1;
 
   /* If we are looking for both IPv4 and IPv6 address we don't want
      the lookup functions to automatically promote IPv4 addresses to

Modified: fsf/trunk/libc/nss/nss_files/files-key.c
==============================================================================
--- fsf/trunk/libc/nss/nss_files/files-key.c (original)
+++ fsf/trunk/libc/nss/nss_files/files-key.c Tue Aug 27 00:01:56 2013
@@ -21,12 +21,10 @@
 #include <string.h>
 #include <netdb.h>
 #include <rpc/key_prot.h>
+#include <rpc/des_crypt.h>
 #include "nsswitch.h"
 
 #define DATAFILE "/etc/publickey"
-
-/* Prototype for function in xcyrpt.c.  */
-extern int xdecrypt (char *, char *);
 
 
 static enum nss_status

Modified: fsf/trunk/libc/stdlib/Makefile
==============================================================================
--- fsf/trunk/libc/stdlib/Makefile (original)
+++ fsf/trunk/libc/stdlib/Makefile Tue Aug 27 00:01:56 2013
@@ -161,6 +161,6 @@
 
 tst-tls-atexit-lib.so-no-z-defs = yes
 
-LDFLAGS-tst-tls-atexit = $(common-objpfx)nptl/libpthread.so \
+$(objpfx)tst-tls-atexit: $(common-objpfx)nptl/libpthread.so \
 			 $(common-objpfx)dlfcn/libdl.so
 $(objpfx)tst-tls-atexit.out: $(objpfx)tst-tls-atexit-lib.so

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits