* 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 7eaa003b3a8b2b56ba94b2ab32a70f70c81b037c..d0852273c37a0792d98d3794a549e1fea0529b6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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-14  Ulrich Drepper  <drepper@redhat.com>
 
        * po/nl.po: Update from translation team.

diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c
index 8ee54f121fd6424f7afa87efc23061a167954e08..c4717e124224cd023ad8d9fbfc2c418587d11949 100644 (file)
--- 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;