about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-14 03:59:19 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-14 03:59:19 +0000
commitfa3ac53fd90dbf5aea93985f84d0813a58c751aa (patch)
treea9aa9fd0ca3c9ff6aab9b00b9631e7b6c8964cda
parent022b51af62a1cd1f46d4ce114ac406dbfcd6fe30 (diff)
downloadglibc-fa3ac53fd90dbf5aea93985f84d0813a58c751aa.tar.gz
glibc-fa3ac53fd90dbf5aea93985f84d0813a58c751aa.tar.xz
glibc-fa3ac53fd90dbf5aea93985f84d0813a58c751aa.zip
[BZ #2764]
2006-08-13  Ulrich Drepper  <drepper@redhat.com>
	[BZ #2764]
	* login/utmpname.c (__utmpname): Remove unnecessary test.
-rw-r--r--ChangeLog5
-rw-r--r--login/utmpname.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index da2794efc9..7c4cc0c54a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-13  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #2764]
+	* login/utmpname.c (__utmpname): Remove unnecessary test.
+
 2006-06-08  Joseph Myers  <jsm28@gcc.gnu.org>
 
 	[BZ #2832]
diff --git a/login/utmpname.c b/login/utmpname.c
index 875dbd5973..24ed7f3c46 100644
--- a/login/utmpname.c
+++ b/login/utmpname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2002, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
 
@@ -50,8 +50,7 @@ __utmpname (const char *file)
     {
       if (strcmp (file, default_file_name) == 0)
 	{
-	  if (__libc_utmp_file_name != default_file_name)
-	    free ((char *) __libc_utmp_file_name);
+	  free ((char *) __libc_utmp_file_name);
 
 	  __libc_utmp_file_name = default_file_name;
 	}