[commits] r1903 - in /fsf/trunk/libc: ChangeLog nis/nis_call.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Apr  6 00:01:40 2007
New Revision: 1903

Log:
Import glibc-mainline for 2007-04-06

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nis/nis_call.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Apr  6 00:01:40 2007
@@ -1,3 +1,8 @@
+2007-04-05  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* nis/nis_call.c (__nisfind_server): Replace (*dir)->do_servers
+	with obj->do_servers after first_shoot.
+
 2007-04-03  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* posix/Makefile (routines): Add sched_cpucount.

Modified: fsf/trunk/libc/nis/nis_call.c
==============================================================================
--- fsf/trunk/libc/nis/nis_call.c (original)
+++ fsf/trunk/libc/nis/nis_call.c Fri Apr  6 00:01:40 2007
@@ -772,15 +772,15 @@
 
   if (result == NIS_SUCCESS)
     {
-      unsigned int server_len = (*dir)->do_servers.do_servers_len;
+      unsigned int server_len = obj->do_servers.do_servers_len;
       if (flags & MASTER_ONLY)
 	server_len = 1;
-      result = __nisbind_create (dbp, (*dir)->do_servers.do_servers_val,
+      result = __nisbind_create (dbp, obj->do_servers.do_servers_val,
 				 server_len, ~0, ~0, flags);
       if (result == NIS_SUCCESS)
 	{
 	  if ((flags & MASTER_ONLY) == 0
-	      || (*dir)->do_servers.do_servers_len == 1)
+	      || obj->do_servers.do_servers_len == 1)
 	    {
 	      server_used = dbp->server_used;
 	      current_ep = dbp->current_ep;