aboutsummaryrefslogtreecommitdiff
path: root/nis/nss_nis
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-04-02 09:18:29 +0000
committerUlrich Drepper <drepper@redhat.com>2004-04-02 09:18:29 +0000
commit4eb6619c70e5db05babfa14abcf389236b73e0df (patch)
tree654166e85dfe14f4750c7eaabc8d5ae5f2444d38 /nis/nss_nis
parent0fce307092e09edb96e0cd69733f1130ca826145 (diff)
downloadglibc-4eb6619c70e5db05babfa14abcf389236b73e0df.zip
glibc-4eb6619c70e5db05babfa14abcf389236b73e0df.tar.gz
glibc-4eb6619c70e5db05babfa14abcf389236b73e0df.tar.bz2
Update.
2004-04-02 Jakub Jelinek <jakub@redhat.com> * nis/nss: Add SERVICES_AUTHORITATIVE. * nis/nss-nis.h (NSS_FLAG_SET, NSS_FLAG_NETID_AUTHORITATIVE, NSS_FLAG_SERVICES_AUTHORITATIVE): Define. (_nis_default_nss_flags, _nis_check_default_nss): New decls. (_nis_default_nss): New inline. * nis/nss-nis.c: Include ctype.h, stdio.h and stdio_ext.h. (_nis_default_nss_flags, default_nss): New variables. (_nis_check_default_nss): New function. * nis/nss_nis/nis-initgroups.c: Don't include stdio.h and stdio_ext.h. (check_default_nss, default_nss): Move to nss-nis.c. (init): Removed. (_nss_nis_initgroups_dyn): Use _nis_default_nss (). * nis/nss_nis/nis-services.c (_nss_nis_getservbyname_r): If NSS_FLAG_SERVICES_AUTHORITATIVE and services.byservicename lookup fails, return immediately.
Diffstat (limited to 'nis/nss_nis')
-rw-r--r--nis/nss_nis/nis-initgroups.c79
-rw-r--r--nis/nss_nis/nis-service.c4
2 files changed, 5 insertions, 78 deletions
diff --git a/nis/nss_nis/nis-initgroups.c b/nis/nss_nis/nis-initgroups.c
index e3ba0cd..c1efe9d 100644
--- a/nis/nss_nis/nis-initgroups.c
+++ b/nis/nss_nis/nis-initgroups.c
@@ -23,8 +23,6 @@
#include <grp.h>
#include <nss.h>
#include <pwd.h>
-#include <stdio.h>
-#include <stdio_ext.h>
#include <string.h>
#include <unistd.h>
#include <rpcsvc/yp.h>
@@ -129,78 +127,6 @@ internal_getgrent_r (struct group *grp, char *buffer, size_t buflen,
}
-static int init;
-static int use_netid;
-
-
-static const char default_nss[] = "/etc/default/nss";
-
-static void
-check_default_nss (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 is only one variable we expect, so
- simplify the parsing. Recognize only
-
- NETID_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";
- if (strncmp (cp, netid_authoritative,
- sizeof (netid_authoritative) - 1) != 0)
- continue;
-
- cp += sizeof (netid_authoritative) - 1;
- 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')
- use_netid = 1;
-
- /* For now, just drop out of the loop. */
- break;
- }
-
- free (line);
-
- fclose (fp);
- }
- init = 1;
-}
-
-
static int
get_uid (const char *user, uid_t *uidp)
{
@@ -321,10 +247,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 (!init)
- check_default_nss ();
-
- if (use_netid)
+ if (_nis_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 6e086e4..32ac619 100644
--- a/nis/nss_nis/nis-service.c
+++ b/nis/nss_nis/nis-service.c
@@ -330,6 +330,10 @@ _nss_nis_getservbyname_r (const char *name, const char *protocol,
return NSS_STATUS_SUCCESS;
}
+ /* Check if it is safe to rely on services.byservicename. */
+ if (_nis_default_nss () & NSS_FLAG_SERVICES_AUTHORITATIVE)
+ return status;
+
struct ypall_callback ypcb;
struct search_t req;