diff options
author | Jakub Jelinek <jakub@redhat.com> | 2006-08-07 19:28:26 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2006-08-07 19:28:26 +0000 |
commit | 503d6a958581777473c31f73113d0fa6cff19b30 (patch) | |
tree | c8526f0403ac272cba94213a3c5b10a369876d78 /sysdeps/unix/sysv/linux/gethostid.c | |
parent | 98d2266156a49df5f93726c8f0b148bbdee41c9d (diff) |
Updated to fedora-glibc-20060807T1859cvs/fedora-glibc-2_4_90-18
Diffstat (limited to 'sysdeps/unix/sysv/linux/gethostid.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/gethostid.c | 6 |
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)); |