diff options
Diffstat (limited to 'nis')
| -rw-r--r-- | nis/Makefile | 4 | ||||
| -rw-r--r-- | nis/Versions | 3 | ||||
| -rw-r--r-- | nis/libnsl.h | 24 | ||||
| -rw-r--r-- | nis/nss-default.c | 117 | ||||
| -rw-r--r-- | nis/nss-nis.c | 87 | ||||
| -rw-r--r-- | nis/nss-nis.h | 14 | ||||
| -rw-r--r-- | nis/nss_nis/nis-initgroups.c | 3 | ||||
| -rw-r--r-- | nis/nss_nis/nis-service.c | 3 |
8 files changed, 152 insertions, 103 deletions
diff --git a/nis/Makefile b/nis/Makefile index fa5c4dfd30..c912a2d824 100644 --- a/nis/Makefile +++ b/nis/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996, 1997, 1998, 2001, 2004 Free Software Foundation, Inc. +# Copyright (C) 1996,1997,1998,2001,2004,2006 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 @@ -54,7 +54,7 @@ libnsl-routines = yp_xdr ypclnt ypupdate_xdr \ nis_print_group_entry nis_domain_of nis_domain_of_r\ nis_modify nis_remove nis_add nis_defaults\ nis_findserv nis_callback nis_clone_dir nis_clone_obj\ - nis_clone_res + nis_clone_res nss-default libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups) libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes)) diff --git a/nis/Versions b/nis/Versions index d6b6a972f6..f77158c26a 100644 --- a/nis/Versions +++ b/nis/Versions @@ -57,6 +57,9 @@ libnsl { GLIBC_2.2 { xdr_ypall; } + GLIBC_PRIVATE { + _nsl_default_nss; + } } libnss_compat { diff --git a/nis/libnsl.h b/nis/libnsl.h new file mode 100644 index 0000000000..e45f24df0e --- /dev/null +++ b/nis/libnsl.h @@ -0,0 +1,24 @@ +/* Copyright (C) 2005, 2006 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#define NSS_FLAG_NETID_AUTHORITATIVE 1 +#define NSS_FLAG_SERVICES_AUTHORITATIVE 2 + + +/* Get current set of default flags. */ +extern int _nsl_default_nss (void); diff --git a/nis/nss-default.c b/nis/nss-default.c new file mode 100644 index 0000000000..3287e68b86 --- /dev/null +++ b/nis/nss-default.c @@ -0,0 +1,117 @@ +/* Copyright (C) 1996, 2001, 2004, 2006 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <ctype.h> +#include <stdio.h> +#include <stdio_ext.h> +#include <stdlib.h> +#include <string.h> +#include <bits/libc-lock.h> + +#include <libnsl.h> + + +/* Path of the file. */ +static const char default_nss[] = "/etc/default/nss"; + +/* Flags once read from the file. */ +static int default_nss_flags; + +/* Code to make sure we call 'init' once. */ +__libc_once_define (static, once); + + +static void +init (void) +{ + FILE *fp = fopen (default_nss, "rc"); + if (fp != NULL) + { + char *line = NULL; + size_t linelen = 0; + + __fsetlocking (fp, FSETLOCKING_BYCALLER); + + while (!feof_unlocked (fp)) + { + ssize_t n = getline (&line, &linelen, fp); + if (n <= 0) + break; + + /* There currently are only two variables we expect, so + simplify the parsing. Recognize only + + NETID_AUTHORITATIVE = TRUE + SERVICES_AUTHORITATIVE = TRUE + + with arbitrary white spaces. */ + char *cp = line; + while (isspace (*cp)) + ++cp; + + /* Recognize comment lines. */ + if (*cp == '#') + continue; + + static const char netid_authoritative[] = "NETID_AUTHORITATIVE"; + static const char services_authoritative[] + = "SERVICES_AUTHORITATIVE"; + size_t flag_len; + if (strncmp (cp, netid_authoritative, + flag_len = sizeof (netid_authoritative) - 1) != 0 + && strncmp (cp, services_authoritative, + flag_len = sizeof (services_authoritative) - 1) + != 0) + continue; + + cp += flag_len; + while (isspace (*cp)) + ++cp; + if (*cp++ != '=') + continue; + while (isspace (*cp)) + ++cp; + + if (strncmp (cp, "TRUE", 4) != 0) + continue; + cp += 4; + + while (isspace (*cp)) + ++cp; + + if (*cp == '\0') + default_nss_flags |= (flag_len == sizeof (netid_authoritative) - 1 + ? NSS_FLAG_NETID_AUTHORITATIVE + : NSS_FLAG_SERVICES_AUTHORITATIVE); + } + + free (line); + + fclose (fp); + } +} + + +int +_nsl_default_nss (void) +{ + /* If we have not yet read the file yet do it now. */ + __libc_once (once, init); + + return default_nss_flags; +} diff --git a/nis/nss-nis.c b/nis/nss-nis.c index 40370bae3b..cff1e765bb 100644 --- a/nis/nss-nis.c +++ b/nis/nss-nis.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 2001, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1996, 2001, 2004, 2006 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 @@ -16,13 +16,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <ctype.h> -#include <stdio.h> -#include <stdio_ext.h> -#include <stdlib.h> -#include <string.h> -#include <rpcsvc/ypclnt.h> - #include "nss-nis.h" #include "nsswitch.h" @@ -50,81 +43,3 @@ const enum nss_status __yperr2nss_tab[] = }; const unsigned int __yperr2nss_count = (sizeof (__yperr2nss_tab) / sizeof (__yperr2nss_tab[0])); - -int _nis_default_nss_flags; - -static const char default_nss[] = "/etc/default/nss"; - -int -_nis_check_default_nss (void) -{ - FILE *fp = fopen (default_nss, "rc"); - int flags = NSS_FLAG_SET; - if (fp != NULL) - { - char *line = NULL; - size_t linelen = 0; - - __fsetlocking (fp, FSETLOCKING_BYCALLER); - - while (!feof_unlocked (fp)) - { - ssize_t n = getline (&line, &linelen, fp); - if (n <= 0) - break; - - /* There currently are only two variables we expect, so - simplify the parsing. Recognize only - - NETID_AUTHORITATIVE = TRUE - SERVICES_AUTHORITATIVE = TRUE - - with arbitrary white spaces. */ - char *cp = line; - while (isspace (*cp)) - ++cp; - - /* Recognize comment lines. */ - if (*cp == '#') - continue; - - static const char netid_authoritative[] = "NETID_AUTHORITATIVE"; - static const char services_authoritative[] - = "SERVICES_AUTHORITATIVE"; - size_t flag_len; - if (strncmp (cp, netid_authoritative, - flag_len = sizeof (netid_authoritative) - 1) != 0 - && strncmp (cp, services_authoritative, - flag_len = sizeof (services_authoritative) - 1) - != 0) - continue; - - cp += flag_len; - while (isspace (*cp)) - ++cp; - if (*cp++ != '=') - continue; - while (isspace (*cp)) - ++cp; - - if (strncmp (cp, "TRUE", 4) != 0) - continue; - cp += 4; - - while (isspace (*cp)) - ++cp; - - if (*cp == '\0') - flags |= flag_len == sizeof (netid_authoritative) - 1 - ? NSS_FLAG_NETID_AUTHORITATIVE - : NSS_FLAG_SERVICES_AUTHORITATIVE; - } - - free (line); - - fclose (fp); - } - - _nis_default_nss_flags = flags; - return flags; -} diff --git a/nis/nss-nis.h b/nis/nss-nis.h index 659b3a14aa..cdf34c648f 100644 --- a/nis/nss-nis.h +++ b/nis/nss-nis.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1996, 2004, 2006 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 @@ -36,16 +36,4 @@ yperr2nss (int errval) return __yperr2nss_tab[(unsigned int) errval]; } -#define NSS_FLAG_SET 1 -#define NSS_FLAG_NETID_AUTHORITATIVE 2 -#define NSS_FLAG_SERVICES_AUTHORITATIVE 4 -extern int _nis_default_nss_flags attribute_hidden; -extern int _nis_check_default_nss (void) attribute_hidden; - -extern inline __attribute__((always_inline)) int -_nis_default_nss (void) -{ - return _nis_default_nss_flags ?: _nis_check_default_nss (); -} - #endif /* nis/nss-nis.h */ diff --git a/nis/nss_nis/nis-initgroups.c b/nis/nss_nis/nis-initgroups.c index 863ac5405f..647adf5119 100644 --- a/nis/nss_nis/nis-initgroups.c +++ b/nis/nss_nis/nis-initgroups.c @@ -30,6 +30,7 @@ #include <sys/param.h> #include "nss-nis.h" +#include <libnsl.h> /* Get the declaration of the parser function. */ #define ENTNAME grent @@ -243,7 +244,7 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start, return NSS_STATUS_UNAVAIL; /* Check whether we are supposed to use the netid.byname map. */ - if (_nis_default_nss () & NSS_FLAG_NETID_AUTHORITATIVE) + if (_nsl_default_nss () & NSS_FLAG_NETID_AUTHORITATIVE) { /* We need the user ID. */ uid_t uid; diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c index 51b668a90e..40772ae743 100644 --- a/nis/nss_nis/nis-service.c +++ b/nis/nss_nis/nis-service.c @@ -27,6 +27,7 @@ #include <rpcsvc/ypclnt.h> #include "nss-nis.h" +#include <libnsl.h> /* Get the declaration of the parser function. */ @@ -324,7 +325,7 @@ _nss_nis_getservbyname_r (const char *name, const char *protocol, } /* Check if it is safe to rely on services.byservicename. */ - if (_nis_default_nss () & NSS_FLAG_SERVICES_AUTHORITATIVE) + if (_nsl_default_nss () & NSS_FLAG_SERVICES_AUTHORITATIVE) return status; struct ypall_callback ypcb; |