From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 15 Nov 2006 22:24:05 +0000 (+0000)
Subject: * nss/nss_files/files-alias.c (get_next_alias): Set line back
X-Git-Tag: upstream/2.30~15261
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f1e92051de9450aa3294f0b4075a72a933418c1;p=external%2Fglibc.git

* nss/nss_files/files-alias.c (get_next_alias): Set line back

	to first_unused after parsing :include: file.
---

diff --git a/ChangeLog b/ChangeLog
index 67e65e2..a7e67e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@redhat.com>
+
+	* 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@redhat.com>
 
diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c
index 8ee54f1..c4717e1 100644
--- a/nss/nss_files/files-alias.c
+++ b/nss/nss_files/files-alias.c
@@ -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@cygnus.com>, 1996.
 
@@ -298,8 +298,8 @@ get_next_alias (const char *match, struct aliasent *result,
 			  first_unused[room_left - 1] = '\0';
 			  strncpy (first_unused, old_line, room_left);
 
-			  if (old_line != NULL)
-			    free (old_line);
+			  free (old_line);
+			  line = first_unused;
 
 			  if (first_unused[room_left - 1] != '\0')
 			    goto no_more_room;