mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-27 04:41:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2004-12-15  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/gethostid.c: Make bi-arch safe.
This commit is contained in:
Ulrich Drepper 2004-12-16 04:14:07 +00:00
parent dcac063c84
commit 04736140ba
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-15 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/gethostid.c: Make bi-arch safe.
2004-12-15 Steven Munroe <sjmunroe@us.ibm.com> 2004-12-15 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Correct stack * sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Correct stack

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

@ -1,4 +1,4 @@
/* Copyright (C) 1995,1996,1998-2001,2003 Free Software Foundation, Inc. /* Copyright (C) 1995,1996,1998-2001,2003,2004 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
@ -33,6 +33,7 @@ sethostid (id)
{ {
int fd; int fd;
ssize_t written; ssize_t written;
int32_t id32 = id;
/* Test for appropriate rights to set host ID. */ /* Test for appropriate rights to set host ID. */
if (__libc_enable_secure) if (__libc_enable_secure)
@ -41,16 +42,23 @@ sethostid (id)
return -1; return -1;
} }
/* Make sure the ID is not too large. Needed for bi-arch support. */
if (id32 != id)
{
__set_errno (EOVERFLOW);
return -1;
}
/* Open file for writing. Everybody is allowed to read this file. */ /* Open file for writing. Everybody is allowed to read this file. */
fd = open_not_cancel (HOSTIDFILE, O_CREAT|O_WRONLY|O_TRUNC, 0644); fd = open_not_cancel (HOSTIDFILE, O_CREAT|O_WRONLY|O_TRUNC, 0644);
if (fd < 0) if (fd < 0)
return -1; return -1;
written = write_not_cancel (fd, &id, sizeof (id)); written = write_not_cancel (fd, &id32, sizeof (id32));
close_not_cancel_no_status (fd); close_not_cancel_no_status (fd);
return written != sizeof (id) ? -1 : 0; return written != sizeof (id32) ? -1 : 0;
} }
#else #else
@ -66,7 +74,7 @@ gethostid ()
size_t buflen; size_t buflen;
char *buffer; char *buffer;
struct hostent hostbuf, *hp; struct hostent hostbuf, *hp;
unsigned long int id; int32_t id;
struct in_addr in; struct in_addr in;
int herr; int herr;
int fd; int fd;
@ -110,6 +118,6 @@ gethostid ()
/* For the return value to be not exactly the IP address we do some /* For the return value to be not exactly the IP address we do some
bit fiddling. */ bit fiddling. */
return in.s_addr << 16 | in.s_addr >> 16; return (int32_t) (in.s_addr << 16 | in.s_addr >> 16);
} }
#endif #endif