[commits] r699 - in /fsf/trunk/libc: ChangeLog nss/nss_files/files-alias.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Nov 16 00:02:28 2006
New Revision: 699

Log:
Import glibc-mainline for 2006-11-16

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nss/nss_files/files-alias.c

Modified: fsf/trunk/libc/ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Nov 16 00:02:28 2006
@@ -3,6 +3,10 @@
 	* po/nl.po: Update from translation team.
 =

 	* timezone/zdump.c: Redo fix for BZ #3137.
+2006-11-14  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* nss/nss_files/files-alias.c (get_next_alias): Set line back
+	to first_unused after parsing :include: file.
 =

 2006-11-10  Ulrich Drepper  <drepper@xxxxxxxxxx>
 =


Modified: fsf/trunk/libc/nss/nss_files/files-alias.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- fsf/trunk/libc/nss/nss_files/files-alias.c (original)
+++ fsf/trunk/libc/nss/nss_files/files-alias.c Thu Nov 16 00:02:28 2006
@@ -1,5 +1,5 @@
 /* Mail alias file parser in nss_files module.
-   Copyright (C) 1996,97,98,99,2002 Free Software Foundation, Inc.
+   Copyright (C) 1996,97,98,99,2002,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
 =

@@ -298,8 +298,8 @@
 			  first_unused[room_left - 1] =3D '\0';
 			  strncpy (first_unused, old_line, room_left);
 =

-			  if (old_line !=3D NULL)
-			    free (old_line);
+			  free (old_line);
+			  line =3D first_unused;
 =

 			  if (first_unused[room_left - 1] !=3D '\0')
 			    goto no_more_room;