lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

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.

Browse Source
This commit is contained in:
Ulrich Drepper
2006-08-03 08:49:48 +00:00
parent 0e4e62fe62
commit a14219efc1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sysdeps/unix/sysv/linux/gethostid.c
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -24,7 +25,6 @@
#include <not-cancel.h> #include <not-cancel.h>
#define HOSTIDFILE "/etc/hostid" #define HOSTIDFILE "/etc/hostid"
#define OLD_HOSTIDFILE "/etc/hostid"
#ifdef SET_PROCEDURE #ifdef SET_PROCEDURE
int int
@ -81,8 +81,6 @@ gethostid ()
/* First try to get the ID from a former invocation of sethostid. */ /* First try to get the ID from a former invocation of sethostid. */
fd = open_not_cancel (HOSTIDFILE, O_RDONLY|O_LARGEFILE, 0); 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) if (fd >= 0)
{ {
ssize_t n = read_not_cancel (fd, &id, sizeof (id)); ssize_t n = read_not_cancel (fd, &id, sizeof (id));