Fix netname2host

diff --git a/ChangeLog b/ChangeLog
index 39176920c18734e3dce4f7ceca7134c084bff539..6cbbc5311f7fe939f88e2983efd30a7240786e2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-29  Andreas Jaeger  <aj@suse.de>
 
+       [BZ #13179]
+       * sunrpc/netname.c (netname2host): Fix logic.
+
        [BZ #6779]
        [BZ #6783]
        * math/w_remainderl.c (__remainderl): Handle (NaN, 0) and (Inf,y)

diff --git a/NEWS b/NEWS
index 87649a867ba72c698e442227210d30dff7375808..6b51b419668f6083c75463e03ce5eb3dfb9329c6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-10-7
+GNU C Library NEWS -- history of user-visible changes.  2011-10-8
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -11,7 +11,7 @@ Version 2.15
 
   6779, 6783, 9696, 11589, 12403, 12847, 12868, 12852, 12874, 12885, 12907,
   12922, 12935, 13007, 13021, 13067, 13068, 13090, 13092, 13114, 13118,
-  13123, 13134, 13138, 13150
+  13123, 13134, 13138, 13150, 13179
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.

diff --git a/sunrpc/netname.c b/sunrpc/netname.c
index e1f1cf68f120c12b04b64d2b08a415afe38660a6..7de2b86be22646e9ee5db925f755aa628cd374e1 100644 (file)
--- a/sunrpc/netname.c
+++ b/sunrpc/netname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2002, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1997-1999, 2002, 2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
@@ -196,9 +196,8 @@ netname2host (const char netname[MAXNETNAMELEN + 1], char *hostname,
              const int hostlen)
 {
   char *p1, *p2;
-  char buffer[MAXNETNAMELEN + 1];
 
-  p1 = strchr (buffer, '.');
+  p1 = strchr (netname, '.');
   if (p1 == NULL)
     return 0;
   p1++;