-/* Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by H.J. Lu <hjl@gnu.ai.mit.edu>, 1997.
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <wctype.h>
+#include <resolv.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include "nsswitch.h"
+
#ifdef USE_NSCD
# define inet_aton __inet_aton
+# include <nscd/nscd_proto.h>
#endif
+int
+__nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
+ char **buffer, size_t *buffer_size,
+ size_t buflen, struct hostent **result,
+ enum nss_status *status, int *typep,
+ int flags, int *afp, int *h_errnop)
+{
+ int save;
+
+ /* We have to test for the use of IPv6 which can only be done by
+ examining `_res'. */
+ if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
+ {
+ if (h_errnop)
+ *h_errnop = NETDB_INTERNAL;
+ *result = NULL;
+ return -1;
+ }
+
/*
* disallow names consisting only of digits/dots, unless
* they end in a dot.
*/
- if (isdigit (name[0]) || (isxdigit (name[0]) || name[0] == ':'))
+ if (isdigit (name[0]) || isxdigit (name[0]) || name[0] == ':')
{
const char *cp;
char *hostname;
char **h_alias_ptr;
size_t size_needed;
int addr_size;
-#ifdef HAVE_TYPE
- int af = type;
-#else
-# ifndef HAVE_AF
- int af = -1;
-# endif
-#endif
+ int af;
+
+ if (typep != NULL)
+ af = *typep;
+ else if (afp != NULL)
+ af = *afp;
+ else
+ af = -1;
switch (af)
{
break;
default:
-#ifdef HAVE_TYPE
- /* This must not happen. */
- *h_errnop = HOST_NOT_FOUND;
- goto done;
-#else
- af = (_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET;
- addr_size = af == AF_INET6 ? IN6ADDRSZ : INADDRSZ;
+ if (typep != NULL)
+ {
+ /* This must not happen. */
+ if (h_errnop != NULL)
+ *h_errnop = HOST_NOT_FOUND;
+ goto done;
+ }
+ else
+ {
+ af = (_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET;
+ addr_size = af == AF_INET6 ? IN6ADDRSZ : INADDRSZ;
+ }
break;
-#endif
}
size_needed = (sizeof (*host_addr)
+ sizeof (*h_addr_ptrs) + strlen (name) + 1);
-#ifdef HAVE_LOOKUP_BUFFER
- if (buflen < size_needed)
- {
-# ifdef NEED_H_ERRNO
- *h_errnop = TRY_AGAIN;
-# endif
- __set_errno (ERANGE);
- goto done;
+ if (buffer_size == NULL)
+ {
+ if (buflen < size_needed)
+ {
+ if (h_errnop != NULL)
+ *h_errnop = TRY_AGAIN;
+ __set_errno (ERANGE);
+ goto done;
+ }
}
-#else
- if (buffer_size < size_needed)
+ else if (buffer_size != NULL && *buffer_size < size_needed)
{
char *new_buf;
- buffer_size = size_needed;
- new_buf = realloc (buffer, buffer_size);
+ *buffer_size = size_needed;
+ new_buf = (char *) realloc (*buffer, *buffer_size);
if (new_buf == NULL)
{
save = errno;
- free (buffer);
- buffer = NULL;
- buffer_size = 0;
+ free (*buffer);
+ *buffer = NULL;
+ *buffer_size = 0;
__set_errno (save);
-# ifdef NEED_H_ERRNO
- *h_errnop = TRY_AGAIN;
-# endif
- result = (struct hostent *) NULL;
+ if (h_errnop != NULL)
+ *h_errnop = TRY_AGAIN;
+ *result = NULL;
goto done;
}
- buffer = new_buf;
+ *buffer = new_buf;
}
-#endif /* HAVE_LOOKUP_BUFFER */
- memset (buffer, 0, size_needed);
+ memset (*buffer, '\0', size_needed);
- host_addr = (host_addr_t *) buffer;
+ host_addr = (host_addr_t *) *buffer;
h_addr_ptrs = (host_addr_list_t *)
((char *) host_addr + sizeof (*host_addr));
h_alias_ptr = (char **) ((char *) h_addr_ptrs + sizeof (*h_addr_ptrs));
{
for (cp = name;; ++cp)
{
- if (!*cp)
+ if (*cp == '\0')
{
int ok;
else
{
assert (af == AF_INET6);
- ok = (inet_pton (af, name, host_addr) > 0);
+ ok = inet_pton (af, name, host_addr) > 0;
}
if (! ok)
{
*h_errnop = HOST_NOT_FOUND;
-#ifndef HAVE_LOOKUP_BUFFER
- result = (struct hostent *) NULL;
-#endif
+ if (buffer_size)
+ *result = NULL;
goto done;
}
- resbuf.h_name = strcpy (hostname, name);
+ resbuf->h_name = strcpy (hostname, name);
h_alias_ptr[0] = NULL;
- resbuf.h_aliases = h_alias_ptr;
- (*h_addr_ptrs)[0] = (char *)host_addr;
- (*h_addr_ptrs)[1] = (char *)0;
- resbuf.h_addr_list = *h_addr_ptrs;
- if (
-#ifdef HAVE_TYPE
- type == AF_INET6
-#else
- af == AF_INET && (_res.options & RES_USE_INET6)
-#endif
- )
+ resbuf->h_aliases = h_alias_ptr;
+ (*h_addr_ptrs)[0] = (char *) host_addr;
+ (*h_addr_ptrs)[1] = NULL;
+ resbuf->h_addr_list = *h_addr_ptrs;
+ if ((typep != NULL && *typep == AF_INET6)
+ || (af == AF_INET
+ && (_res.options & RES_USE_INET6)))
{
-#ifdef HAVE_TYPE
- if ((flags & AI_V4MAPPED) == 0)
+ if (typep != NULL && (flags & AI_V4MAPPED) == 0)
{
/* That's bad. The user hasn't specified that she
allows IPv4 numeric addresses. */
- result = NULL;
+ *result = NULL;
*h_errnop = HOST_NOT_FOUND;
goto done;
}
else
-#endif
{
/* We need to change the IP v4 address into the
IP v6 address. */
- char tmp[INADDRSZ], *p = (char *) host_addr;
+ char tmp[INADDRSZ];
+ char *p = (char *) host_addr;
int i;
/* Save a copy of the IP v4 address. */
*p++ = 0xff;
/* Copy the IP v4 address. */
memcpy (p, tmp, INADDRSZ);
- resbuf.h_addrtype = AF_INET6;
- resbuf.h_length = IN6ADDRSZ;
+ resbuf->h_addrtype = AF_INET6;
+ resbuf->h_length = IN6ADDRSZ;
}
}
else
{
- resbuf.h_addrtype = af;
- resbuf.h_length = addr_size;
+ resbuf->h_addrtype = af;
+ resbuf->h_length = addr_size;
}
- *h_errnop = NETDB_SUCCESS;
-#ifdef HAVE_LOOKUP_BUFFER
- status = NSS_STATUS_SUCCESS;
-#else
- result = &resbuf;
-#endif
+ if (h_errnop != NULL)
+ *h_errnop = NETDB_SUCCESS;
+ if (buffer_size == NULL)
+ *status = NSS_STATUS_SUCCESS;
+ else
+ *result = resbuf;
goto done;
}
- if (!isdigit (*cp) && *cp != '.') break;
+ if (!isdigit (*cp) && *cp != '.')
+ break;
}
}
- if ((isxdigit (name[0]) && strchr (name, ':') != NULL)
- || name[0] == ':')
+ if ((isxdigit (name[0]) && strchr (name, ':') != NULL) || name[0] == ':')
{
const char *cp;
char *hostname;
- typedef unsigned char host_addr_t [16];
+ typedef unsigned char host_addr_t[16];
host_addr_t *host_addr;
- typedef char *host_addr_list_t [2];
+ typedef char *host_addr_list_t[2];
host_addr_list_t *h_addr_ptrs;
size_t size_needed;
int addr_size;
-#ifdef HAVE_TYPE
- int af = type;
-#else
-# ifndef HAVE_AF
- int af = -1;
-# endif
-#endif
+ int af;
+
+ if (typep != NULL)
+ af = *typep;
+ else if (afp != NULL)
+ af = *afp;
+ else
+ af = -1;
switch (af)
{
/* This is not possible. We cannot represent an IPv6 address
in an `struct in_addr' variable. */
*h_errnop = HOST_NOT_FOUND;
- result = NULL;
+ *result = NULL;
goto done;
case AF_INET6:
size_needed = (sizeof (*host_addr)
+ sizeof (*h_addr_ptrs) + strlen (name) + 1);
-#ifdef HAVE_LOOKUP_BUFFER
- if (buflen < size_needed)
+ if (buffer_size == NULL && buflen < size_needed)
{
-# ifdef NEED_H_ERRNO
- *h_errnop = TRY_AGAIN;
-# endif
+ if (h_errnop != NULL)
+ *h_errnop = TRY_AGAIN;
__set_errno (ERANGE);
goto done;
}
-#else
- if (buffer_size < size_needed)
+ else if (buffer_size != NULL && *buffer_size < size_needed)
{
char *new_buf;
- buffer_size = size_needed;
- new_buf = realloc (buffer, buffer_size);
+ *buffer_size = size_needed;
+ new_buf = realloc (*buffer, *buffer_size);
if (new_buf == NULL)
{
save = errno;
- free (buffer);
+ free (*buffer);
__set_errno (save);
- buffer = NULL;
- buffer_size = 0;
- result = (struct hostent *) NULL;
+ *buffer = NULL;
+ *buffer_size = 0;
+ *result = NULL;
goto done;
}
- buffer = new_buf;
+ *buffer = new_buf;
}
-#endif /* HAVE_LOOKUP_BUFFER */
- memset (buffer, 0, size_needed);
+ memset (*buffer, '\0', size_needed);
- host_addr = (host_addr_t *) buffer;
+ host_addr = (host_addr_t *) *buffer;
h_addr_ptrs = (host_addr_list_t *)
((char *) host_addr + sizeof (*host_addr));
hostname = (char *) h_addr_ptrs + sizeof (*h_addr_ptrs);
if (inet_pton (AF_INET6, name, host_addr) <= 0)
{
*h_errnop = HOST_NOT_FOUND;
-#ifndef HAVE_LOOKUP_BUFFER
- result = (struct hostent *) NULL;
-#endif
+ if (buffer_size)
+ *result = NULL;
goto done;
}
- resbuf.h_name = strcpy (hostname, name);
+ resbuf->h_name = strcpy (hostname, name);
h_alias_ptr[0] = NULL;
- resbuf.h_aliases = h_alias_ptr;
+ resbuf->h_aliases = h_alias_ptr;
(*h_addr_ptrs)[0] = (char *) host_addr;
(*h_addr_ptrs)[1] = (char *) 0;
- resbuf.h_addr_list = *h_addr_ptrs;
- resbuf.h_addrtype = AF_INET6;
- resbuf.h_length = addr_size;
+ resbuf->h_addr_list = *h_addr_ptrs;
+ resbuf->h_addrtype = AF_INET6;
+ resbuf->h_length = addr_size;
*h_errnop = NETDB_SUCCESS;
-#ifdef HAVE_LOOKUP_BUFFER
- status = NSS_STATUS_SUCCESS;
-#else
- result = &resbuf;
-#endif
+ if (buffer_size == NULL)
+ *status = NSS_STATUS_SUCCESS;
+ else
+ *result = resbuf;
goto done;
}
- if (!isxdigit (*cp) && *cp != ':' && *cp != '.') break;
+ if (!isxdigit (*cp) && *cp != ':' && *cp != '.')
+ break;
}
}
}
+
+ return 0;
+
+done:
+ return 1;
+}
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2001 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
#ifdef NEED_H_ERRNO
# define H_ERRNO_PARM , int *h_errnop
# define H_ERRNO_VAR , &h_errno_tmp
+# define H_ERRNO_VAR_P &h_errno_tmp
#else
# define H_ERRNO_PARM
# define H_ERRNO_VAR
+# define H_ERRNO_VAR_P NULL
#endif
+#ifndef HAVE_TYPE
+# define TYPE_VAR_P NULL
+# define FLAGS_VAR 0
+#endif
+
+#ifdef HAVE_AF
+# define AF_VAR_P &af
+#else
+# define AF_VAR_P NULL
+#endif
/* Prototype for reentrant version we use here. */
extern int INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf,
int save;
#ifdef NEED_H_ERRNO
int h_errno_tmp = 0;
-# ifdef HANDLE_DIGITS_DOTS
- int *const h_errnop = &h_errno_tmp;;
-# endif
#endif
/* Get lock. */
buffer = malloc (buffer_size);
}
+#ifdef HANDLE_DIGITS_DOTS
if (buffer != NULL)
{
-#ifdef HANDLE_DIGITS_DOTS
- /* We have to test for the use of IPv6 which can only be done by
- examining `_res'. */
- if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
- {
-# ifdef NEED_H_ERRNO
- h_errno_tmp = NETDB_INTERNAL;
-# endif
- result = NULL;
- goto done;
- }
-# include "digits_dots.c"
-#endif
+ if (__nss_hostname_digits_dots (name, &resbuf, &buffer,
+ &buffer_size,
+ 0, &result, NULL, TYPE_VAR_P,
+ FLAGS_VAR, AF_VAR_P,
+ H_ERRNO_VAR_P))
+ goto done;
}
+#endif
while (buffer != NULL
&& (INTERNAL (REENTRANT_NAME) (ADD_VARIABLES, &resbuf, buffer,
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2001 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
void *__nss_lookup_function (service_user *ni, const char *fct_name);
-typedef int (*db_lookup_function) (service_user **, const char *,
- void **);
+typedef int (*db_lookup_function) (service_user **, const char *, void **);
typedef enum nss_status (*setent_function) (int);
-typedef enum nss_status (*endent_function) (void);
+typedef enum nss_status (*endent_function) (void);
typedef enum nss_status (*getent_function) (void *, char *, size_t,
- int *, int *);
+ int *, int *);
typedef int (*getent_r_function) (void *, char *, size_t,
- void **result, int *);
+ void **result, int *);
extern void __nss_setent (const char *func_name,
db_lookup_function lookup_fct,
extern void *__nss_getent (getent_r_function func,
void **resbuf, char **buffer, size_t buflen,
size_t *buffer_size, int *h_errnop);
+struct hostent;
+extern int __nss_hostname_digits_dots (const char *name,
+ struct hostent *resbuf, char **buffer,
+ size_t *buffer_size, size_t buflen,
+ struct hostent **result,
+ enum nss_status *status, int *typep,
+ int flags, int *afp, int *h_errnop);
#endif /* nsswitch.h */
git://sourceware.org / glibc.git / commitdiff