[commits] r3242 - in /fsf/trunk/libc: ChangeLog nis/nis_table.c string/strfry.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Aug 23 00:03:05 2007
New Revision: 3242

Log:
Import glibc-mainline for 2007-08-23

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nis/nis_table.c
    fsf/trunk/libc/string/strfry.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Aug 23 00:03:05 2007
@@ -1,3 +1,8 @@
+2007-08-17  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* nis/nis_table.c (nis_list): Don't fail if __follow_path returned
+	NIS_NOTFOUND.
+
 2007-08-21  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #4566]

Modified: fsf/trunk/libc/nis/nis_table.c
==============================================================================
--- fsf/trunk/libc/nis/nis_table.c (original)
+++ fsf/trunk/libc/nis/nis_table.c Thu Aug 23 00:03:05 2007
@@ -372,7 +372,8 @@
 					     &bptr);
 		if (clnt_status != NIS_SUCCESS)
 		  {
-		    NIS_RES_STATUS (res) = clnt_status;
+		    if (clnt_status == NIS_NOMEMORY)
+		      NIS_RES_STATUS (res) = clnt_status;
 		    ++done;
 		  }
 		else
@@ -452,10 +453,14 @@
 		  ++done;
 		else
 		  {
-		    NIS_RES_STATUS (res)
+		    clnt_status
 		      = __follow_path (&tablepath, &tableptr, ibreq, &bptr);
-		    if (NIS_RES_STATUS (res) != NIS_SUCCESS)
-		      ++done;
+		    if (clnt_status != NIS_SUCCESS)
+		      {
+			if (clnt_status == NIS_NOMEMORY)
+			  NIS_RES_STATUS (res) = clnt_status;
+			++done;
+		      }
 		  }
 	      }
 	    break;

Modified: fsf/trunk/libc/string/strfry.c
==============================================================================
--- fsf/trunk/libc/string/strfry.c (original)
+++ fsf/trunk/libc/string/strfry.c Thu Aug 23 00:03:05 2007
@@ -42,7 +42,7 @@
     {
       int32_t j;
       __random_r (&rdata, &j);
-      j = j % len + 1;
+      j = j % (len - i) + i;
 
       char c = string[i];
       string[i] = string[j];