[commits] r6296 - in /fsf/trunk/libc: ChangeLog nscd/nscd_getserv_r.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jun  4 00:04:00 2008
New Revision: 6296

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

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nscd/nscd_getserv_r.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jun  4 00:04:00 2008
@@ -1,3 +1,9 @@
+2008-06-03  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* nscd/nscd_getserv_r.c (__nscd_getservbyport_r): Pass cp
+	instead of portstr to nscd_getserv_r.  Patch by
+	Roman Kagan <rkagan@xxxxxxx>.
+
 2008-05-26  Jim Meyering  <meyering@xxxxxxxxxx>
 
 	Remove more useless "if" tests before "free".

Modified: fsf/trunk/libc/nscd/nscd_getserv_r.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd_getserv_r.c (original)
+++ fsf/trunk/libc/nscd/nscd_getserv_r.c Wed Jun  4 00:04:00 2008
@@ -53,7 +53,7 @@
   portstr[sizeof (portstr) - 1] = '\0';
   char *cp = _itoa_word (port, portstr + sizeof (portstr) - 1, 10, 0);
 
-  return nscd_getserv_r (portstr, portstr + sizeof (portstr) - cp, proto,
+  return nscd_getserv_r (cp, portstr + sizeof (portstr) - cp, proto,
 			 GETSERVBYPORT, result_buf, buf, buflen, result);
 }