about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-03 08:49:48 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-03 08:49:48 +0000
commita14219efc11f7f4f0cf6bea92be9e43f91118012 (patch)
tree67fdc698bb6845dff9679692c3d3a2193b702edf
parent0e4e62fe62536ce89868a89afa03fb9a5ba6f7d4 (diff)
downloadglibc-a14219efc11f7f4f0cf6bea92be9e43f91118012.tar.gz
glibc-a14219efc11f7f4f0cf6bea92be9e43f91118012.tar.xz
glibc-a14219efc11f7f4f0cf6bea92be9e43f91118012.zip
Don't define OLD_HOSTIDFILE and don't try to open it. The patch introducing the macro contained a bug and used the same file name as the new file instead of using /var/adm/hostid. Nobody complaint so I'm taking this out completely.
-rw-r--r--sysdeps/unix/sysv/linux/gethostid.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c
index f44a9afbf2..de98fb3d7b 100644
--- a/sysdeps/unix/sysv/linux/gethostid.c
+++ b/sysdeps/unix/sysv/linux/gethostid.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1996,1998-2001,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998-2001,2003,2004,2006
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -24,7 +25,6 @@
 #include <not-cancel.h>
 
 #define HOSTIDFILE "/etc/hostid"
-#define OLD_HOSTIDFILE "/etc/hostid"
 
 #ifdef SET_PROCEDURE
 int
@@ -81,8 +81,6 @@ gethostid ()
 
   /* First try to get the ID from a former invocation of sethostid.  */
   fd = open_not_cancel (HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0);
-  if (fd < 0)
-    fd = open_not_cancel (OLD_HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0);
   if (fd >= 0)
     {
       ssize_t n = read_not_cancel (fd, &id, sizeof (id));