diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/gethostid.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/gethostid.c | 54 |
1 files changed, 34 insertions, 20 deletions
diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c index ca2669d3e6..b313ab3409 100644 --- a/sysdeps/unix/sysv/linux/gethostid.c +++ b/sysdeps/unix/sysv/linux/gethostid.c @@ -1,20 +1,21 @@ /* Copyright (C) 1995, 1996 Free Software Foundation, Inc. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <alloca.h> #include <errno.h> #include <fcntl.h> #include <unistd.h> @@ -58,9 +59,12 @@ long int gethostid () { char hostname[MAXHOSTNAMELEN + 1]; - struct hostent *hp; - unsigned long id; + size_t buflen; + char *buffer; + struct hostent hostbuf, *hp; + unsigned long int id; struct in_addr in; + int herr; int fd; /* First try to get the ID from a former invocation of sethostid. */ @@ -81,10 +85,20 @@ gethostid () /* This also fails. Return and arbitrary value. */ return 0; + buflen = 1024; + buffer = __alloca (buflen); + /* To get the IP address we need to know the host name. */ - hp = gethostbyname (hostname); - if (hp == NULL) - return 0; + while (__gethostbyname_r (hostname, &hostbuf, buffer, buflen, &hp, &herr) + < 0) + if (herr != NETDB_INTERNAL || errno != ERANGE) + return 0; + else + { + /* Enlarge buffer. */ + buflen *= 2; + buffer = __alloca (buflen); + } in.s_addr = 0; memcpy (&in, hp->h_addr, |