diff options
Diffstat (limited to 'hesiod/nss_hesiod')
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-grp.c | 79 | ||||
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-init.c | 39 | ||||
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-proto.c | 137 | ||||
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-pwd.c | 78 | ||||
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-service.c | 95 | ||||
| -rw-r--r-- | hesiod/nss_hesiod/nss_hesiod.h | 21 |
6 files changed, 266 insertions, 183 deletions
diff --git a/hesiod/nss_hesiod/hesiod-grp.c b/hesiod/nss_hesiod/hesiod-grp.c index a973fab80f..2d5b96b7f9 100644 --- a/hesiod/nss_hesiod/hesiod-grp.c +++ b/hesiod/nss_hesiod/hesiod-grp.c @@ -21,11 +21,12 @@ #include <errno.h> #include <grp.h> #include <hesiod.h> +#include <nss.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <nss.h> -#include <bits/libc-lock.h> + +#include "nss_hesiod.h" /* Get the declaration of the parser function. */ #define ENTNAME grent @@ -33,50 +34,15 @@ #define EXTERN_PARSER #include <nss/nss_files/files-parse.c> -/* Locks the static variables in this file. */ -__libc_lock_define_initialized (static, lock); - -static void *context = NULL; - -static enum nss_status -internal_setgrent (void) -{ - if (!context) - { - if (hesiod_init (&context) == -1) - return NSS_STATUS_UNAVAIL; - } - - return NSS_STATUS_SUCCESS; -} - enum nss_status _nss_hesiod_setgrent (void) { - enum nss_status status; - - __libc_lock_lock (lock); - - status = internal_setgrent (); - - __libc_lock_unlock (lock); - - return status; + return NSS_STATUS_SUCCESS; } enum nss_status _nss_hesiod_endgrent (void) { - __libc_lock_lock (lock); - - if (context) - { - hesiod_end (context); - context = NULL; - } - - __libc_lock_unlock (lock); - return NSS_STATUS_SUCCESS; } @@ -84,32 +50,37 @@ static enum nss_status lookup (const char *name, const char *type, struct group *grp, char *buffer, size_t buflen, int *errnop) { - enum nss_status status; struct parser_data *data = (void *) buffer; size_t linebuflen; + void *context; char **list; int parse_res; size_t len; - status = internal_setgrent (); - if (status != NSS_STATUS_SUCCESS) - return status; + context = _nss_hesiod_init (); + if (context == NULL) + return NSS_STATUS_UNAVAIL; list = hesiod_resolve (context, name, type); if (list == NULL) - return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + { + hesiod_end (context); + return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + } linebuflen = buffer + buflen - data->linebuffer; len = strlen (*list) + 1; if (linebuflen < len) { hesiod_free_list (context, list); + hesiod_end (context); *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } memcpy (data->linebuffer, *list, len); hesiod_free_list (context, list); + hesiod_end (context); parse_res = _nss_files_parse_grent (buffer, grp, data, buflen, errnop); if (parse_res < 1) @@ -122,34 +93,19 @@ enum nss_status _nss_hesiod_getgrnam_r (const char *name, struct group *grp, char *buffer, size_t buflen, int *errnop) { - enum nss_status status; - - __libc_lock_lock (lock); - - status = lookup (name, "group", grp, buffer, buflen, errnop); - - __libc_lock_unlock (lock); - - return status; + return lookup (name, "group", grp, buffer, buflen, errnop); } enum nss_status _nss_hesiod_getgrgid_r (gid_t gid, struct group *grp, char *buffer, size_t buflen, int *errnop) { - enum nss_status status = NSS_STATUS_UNAVAIL; char gidstr[21]; /* We will probably never have a gid_t with more than 64 bits. */ snprintf (gidstr, sizeof gidstr, "%d", gid); - __libc_lock_lock (lock); - - status = lookup (gidstr, "gid", grp, buffer, buflen, errnop); - - __libc_lock_unlock (lock); - - return status; + return lookup (gidstr, "gid", grp, buffer, buflen, errnop); } static int @@ -217,7 +173,8 @@ _nss_hesiod_initgroups (const char *user, gid_t group, long int *start, char *p; void *context; - if (hesiod_init (&context) == -1) + context = _nss_hesiod_init (); + if (context == NULL) return NSS_STATUS_UNAVAIL; list = hesiod_resolve (context, user, "grplist"); diff --git a/hesiod/nss_hesiod/hesiod-init.c b/hesiod/nss_hesiod/hesiod-init.c new file mode 100644 index 0000000000..ab85ff3cbc --- /dev/null +++ b/hesiod/nss_hesiod/hesiod-init.c @@ -0,0 +1,39 @@ +/* Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 2000. + + 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 <sys/cdefs.h> /* Needs to come before <hesiod.h>. */ +#include <hesiod.h> +#include <resolv.h> +#include <stddef.h> + +#include "nss_hesiod.h" + +void * +_nss_hesiod_init (void) +{ + void *context; + + if (hesiod_init (&context) == -1) + return NULL; + + /* Use the default (per-thread) resolver state. */ + __hesiod_res_set (context, &_res, NULL); + + return context; +} diff --git a/hesiod/nss_hesiod/hesiod-proto.c b/hesiod/nss_hesiod/hesiod-proto.c new file mode 100644 index 0000000000..d77e8d9134 --- /dev/null +++ b/hesiod/nss_hesiod/hesiod-proto.c @@ -0,0 +1,137 @@ +/* Copyright (C) 1997, 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. + + 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 <errno.h> +#include <hesiod.h> +#include <netdb.h> +#include <netinet/in.h> +#include <nss.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "nss_hesiod.h" + +/* Declare a parser for Hesiod protocol entries. Although the format + of the entries is identical to those in /etc/protocols, here is no + predefined parser for us to use. */ + +#define ENTNAME protoent + +struct protoent_data {}; + +#define TRAILING_LIST_MEMBER p_aliases +#define TRAILING_LIST_SEPARATOR_P isspace +#include <nss/nss_files/files-parse.c> +LINE_PARSER +("#", + STRING_FIELD (result->p_name, isspace, 1); + INT_FIELD (result->p_proto, isspace, 1, 10,); + ) + +enum nss_status +_nss_hesiod_setprotoent (void) +{ + return NSS_STATUS_SUCCESS; +} + +enum nss_status +_nss_hesiod_endprotoent (void) +{ + return NSS_STATUS_SUCCESS; +} + +static enum nss_status +lookup (const char *name, const char *type, struct protoent *proto, + char *buffer, size_t buflen, int *errnop) +{ + struct parser_data *data = (void *) buffer; + size_t linebuflen; + void *context; + char **list, **item; + int parse_res; + int found; + + context = _nss_hesiod_init (); + if (context == NULL) + return NSS_STATUS_UNAVAIL; + + list = hesiod_resolve (context, name, type); + if (list == NULL) + { + hesiod_end (context); + return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + } + + linebuflen = buffer + buflen - data->linebuffer; + + item = list; + found = 0; + do + { + size_t len = strlen (*item) + 1; + + if (linebuflen < len) + { + hesiod_free_list (context, list); + hesiod_end (context); + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; + } + + memcpy (data->linebuffer, *item, len); + + parse_res = parse_line (buffer, proto, data, buflen, errnop); + if (parse_res == -1) + { + hesiod_free_list (context, list); + hesiod_end (context); + return NSS_STATUS_TRYAGAIN; + } + + if (parse_res > 0) + found = 1; + + ++item; + } + while (*item != NULL && !found); + + hesiod_free_list (context, list); + hesiod_end (context); + + return found ? NSS_STATUS_SUCCESS : NSS_STATUS_NOTFOUND; +} + +enum nss_status +_nss_hesiod_getprotobyname_r (const char *name, struct protoent *proto, + char *buffer, size_t buflen, int *errnop) +{ + return lookup (name, "protocol", proto, buffer, buflen, errnop); +} + +enum nss_status +_nss_hesiod_getprotobynumber_r (const int protocol, struct protoent *proto, + char *buffer, size_t buflen, int *errnop) +{ + char protostr[21]; + + snprintf (protostr, sizeof protostr, "%d", protocol); + + return lookup (protostr, "protonum", proto, buffer, buflen, errnop); +} diff --git a/hesiod/nss_hesiod/hesiod-pwd.c b/hesiod/nss_hesiod/hesiod-pwd.c index ce97443164..b7d2dd5c09 100644 --- a/hesiod/nss_hesiod/hesiod-pwd.c +++ b/hesiod/nss_hesiod/hesiod-pwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -17,65 +17,31 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <bits/libc-lock.h> #include <errno.h> #include <hesiod.h> -#include <nss.h> #include <pwd.h> +#include <nss.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "nss_hesiod.h" + /* Get the declaration of the parser function. */ #define ENTNAME pwent #define STRUCTURE passwd #define EXTERN_PARSER #include <nss/nss_files/files-parse.c> -/* Locks the static variables in this file. */ -__libc_lock_define_initialized (static, lock); - -static void *context = NULL; - -static enum nss_status -internal_setpwent (void) -{ - if (!context) - { - if (hesiod_init (&context) == -1) - return NSS_STATUS_UNAVAIL; - } - - return NSS_STATUS_SUCCESS; -} - enum nss_status _nss_hesiod_setpwent (void) { - enum nss_status status; - - __libc_lock_lock (lock); - - status = internal_setpwent (); - - __libc_lock_unlock (lock); - - return status; + return NSS_STATUS_SUCCESS; } enum nss_status _nss_hesiod_endpwent (void) { - __libc_lock_lock (lock); - - if (context) - { - hesiod_end (context); - context = NULL; - } - - __libc_lock_unlock (lock); - return NSS_STATUS_SUCCESS; } @@ -83,32 +49,37 @@ static enum nss_status lookup (const char *name, const char *type, struct passwd *pwd, char *buffer, size_t buflen, int *errnop) { - enum nss_status status; struct parser_data *data = (void *) buffer; size_t linebuflen; + void *context; char **list; int parse_res; size_t len; - status = internal_setpwent (); - if (status != NSS_STATUS_SUCCESS) - return status; + context = _nss_hesiod_init (); + if (context == NULL) + return NSS_STATUS_UNAVAIL; list = hesiod_resolve (context, name, type); if (list == NULL) - return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + { + hesiod_end (context); + return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + } linebuflen = buffer + buflen - data->linebuffer; len = strlen (*list) + 1; if (linebuflen < len) { hesiod_free_list (context, list); + hesiod_end (context); *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } memcpy (data->linebuffer, *list, len); hesiod_free_list (context, list); + hesiod_end (context); parse_res = _nss_files_parse_pwent (buffer, pwd, data, buflen, errnop); if (parse_res < 1) @@ -121,32 +92,17 @@ enum nss_status _nss_hesiod_getpwnam_r (const char *name, struct passwd *pwd, char *buffer, size_t buflen, int *errnop) { - enum nss_status status; - - __libc_lock_lock (lock); - - status = lookup (name, "passwd", pwd, buffer, buflen, errnop); - - __libc_lock_unlock (lock); - - return status; + return lookup (name, "passwd", pwd, buffer, buflen, errnop); } enum nss_status _nss_hesiod_getpwuid_r (uid_t uid, struct passwd *pwd, char *buffer, size_t buflen, int *errnop) { - enum nss_status status = NSS_STATUS_UNAVAIL; char uidstr[21]; /* We will probably never have a gid_t with more than 64 bits. */ snprintf (uidstr, sizeof uidstr, "%d", uid); - __libc_lock_lock (lock); - - status = lookup (uidstr, "uid", pwd, buffer, buflen, errnop); - - __libc_lock_unlock (lock); - - return status; + return lookup (uidstr, "uid", pwd, buffer, buflen, errnop); } diff --git a/hesiod/nss_hesiod/hesiod-service.c b/hesiod/nss_hesiod/hesiod-service.c index e0ca965310..8faea3aa5d 100644 --- a/hesiod/nss_hesiod/hesiod-service.c +++ b/hesiod/nss_hesiod/hesiod-service.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -17,102 +17,68 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <bits/libc-lock.h> #include <errno.h> #include <hesiod.h> #include <netdb.h> #include <netinet/in.h> #include <nss.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> +#include "nss_hesiod.h" /* Hesiod uses a format for service entries that differs from the traditional format. We therefore declare our own parser. */ #define ENTNAME servent -#define ENTDATA servent_data struct servent_data {}; #define TRAILING_LIST_MEMBER s_aliases #define TRAILING_LIST_SEPARATOR_P isspace #include <nss/nss_files/files-parse.c> -#define ISSEMICOLON(c) ((c) == ';') +#define ISSC_OR_SPACE(c) ((c) == ';' || isspace (c)) LINE_PARSER -("", - (void) entdata; - STRING_FIELD (result->s_name, ISSEMICOLON, 1); - STRING_FIELD (result->s_proto, ISSEMICOLON, 1); - INT_FIELD (result->s_port, ISSEMICOLON, 10, 0, htons); +("#", + STRING_FIELD (result->s_name, ISSC_OR_SPACE, 1); + STRING_FIELD (result->s_proto, ISSC_OR_SPACE, 1); + INT_FIELD (result->s_port, ISSC_OR_SPACE, 10, 0, htons); ) - -/* Locks the static variables in this file. */ -__libc_lock_define_initialized (static, lock); - -static void *context = NULL; - -static enum nss_status -internal_setservent (void) -{ - if (!context) - { - if (hesiod_init (&context) == -1) - return NSS_STATUS_UNAVAIL; - } - - return NSS_STATUS_SUCCESS; -} - enum nss_status _nss_hesiod_setservent (void) { - enum nss_status status; - - __libc_lock_lock (lock); - - status = internal_setservent (); - - __libc_lock_unlock (lock); - - return status; + return NSS_STATUS_SUCCESS; } enum nss_status _nss_hesiod_endservent (void) { - __libc_lock_lock (lock); - - if (context) - { - hesiod_end (context); - context = NULL; - } - - __libc_lock_unlock (lock); - return NSS_STATUS_SUCCESS; } static enum nss_status -lookup (const char *name, const char *protocol, struct servent *serv, - char *buffer, size_t buflen, int *errnop) +lookup (const char *name, const char *type, const char *protocol, + struct servent *serv, char *buffer, size_t buflen, int *errnop) { - enum nss_status status; struct parser_data *data = (void *) buffer; size_t linebuflen; + void *context; char **list, **item; int parse_res; int found; - status = internal_setservent (); - if (status != NSS_STATUS_SUCCESS) - return status; + context = _nss_hesiod_init (); + if (context == NULL) + return NSS_STATUS_UNAVAIL; - list = hesiod_resolve (context, name, "service"); + list = hesiod_resolve (context, name, type); if (list == NULL) - return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + { + hesiod_end (context); + return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + } linebuflen = buffer + buflen - data->linebuffer; @@ -125,6 +91,7 @@ lookup (const char *name, const char *protocol, struct servent *serv, if (linebuflen < len) { hesiod_free_list (context, list); + hesiod_end (context); *errnop = ERANGE; return NSS_STATUS_TRYAGAIN; } @@ -135,17 +102,19 @@ lookup (const char *name, const char *protocol, struct servent *serv, if (parse_res == -1) { hesiod_free_list (context, list); + hesiod_end (context); return NSS_STATUS_TRYAGAIN; } if (parse_res > 0) - found = protocol == NULL || strcmp (serv->s_proto, protocol) == 0; + found = protocol == NULL || strcasecmp (serv->s_proto, protocol) == 0; ++item; } while (*item != NULL && !found); hesiod_free_list (context, list); + hesiod_end (context); return found ? NSS_STATUS_SUCCESS : NSS_STATUS_NOTFOUND; } @@ -155,13 +124,17 @@ _nss_hesiod_getservbyname_r (const char *name, const char *protocol, struct servent *serv, char *buffer, size_t buflen, int *errnop) { - enum nss_status status; - - __libc_lock_lock (lock); + return lookup (name, "service", protocol, serv, buffer, buflen, errnop); +} - status = lookup (name, protocol, serv, buffer, buflen, errnop); +enum nss_status +_nss_hesiod_getservbyport_r (const int port, const char *protocol, + struct servent *serv, + char *buffer, size_t buflen, int *errnop) +{ + char portstr[6]; /* Port numbers are restricted to 16 bits. */ - __libc_lock_unlock (lock); + snprintf (portstr, sizeof portstr, "%d", ntohs (port)); - return status; + return lookup (portstr, "port", protocol, serv, buffer, buflen, errnop); } diff --git a/hesiod/nss_hesiod/nss_hesiod.h b/hesiod/nss_hesiod/nss_hesiod.h new file mode 100644 index 0000000000..78039d8352 --- /dev/null +++ b/hesiod/nss_hesiod/nss_hesiod.h @@ -0,0 +1,21 @@ +/* Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 2000. + + 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. */ + +/* Initialize a Hesiod context. */ +extern void *_nss_hesiod_init (void); |