aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-11-15 22:24:05 +0000
committerUlrich Drepper <drepper@redhat.com>2006-11-15 22:24:05 +0000
commit3f1e92051de9450aa3294f0b4075a72a933418c1 (patch)
tree2858638ef7b3f86c8439537ddf8f5b3d072cc7a4
parent2c53fa206316e3b7ff18aaecc4239ba9dcf50fac (diff)
downloadglibc-3f1e92051de9450aa3294f0b4075a72a933418c1.zip
glibc-3f1e92051de9450aa3294f0b4075a72a933418c1.tar.gz
glibc-3f1e92051de9450aa3294f0b4075a72a933418c1.tar.bz2
* nss/nss_files/files-alias.c (get_next_alias): Set line back
to first_unused after parsing :include: file.
-rw-r--r--ChangeLog4
-rw-r--r--nss/nss_files/files-alias.c6
2 files changed, 7 insertions, 3 deletions
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;