diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-10-31 06:44:41 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-10-31 06:44:41 +0000 |
| commit | 8f35520cb3ef271407d73404a59d51a6b815e8f7 (patch) | |
| tree | b0ce1a322a5f80f19f6121a556a00310e70527b7 /Src/hashtable.c | |
| parent | beaf69f4283ba80c5b9b8251c7116e22b0a65e82 (diff) | |
| download | zsh-8f35520cb3ef271407d73404a59d51a6b815e8f7.tar.gz zsh-8f35520cb3ef271407d73404a59d51a6b815e8f7.tar.xz zsh-8f35520cb3ef271407d73404a59d51a6b815e8f7.zip | |
zsh-workers/8474
Diffstat (limited to 'Src/hashtable.c')
| -rw-r--r-- | Src/hashtable.c | 58 |
1 files changed, 39 insertions, 19 deletions
diff --git a/Src/hashtable.c b/Src/hashtable.c index d4c832f16..24c23e423 100644 --- a/Src/hashtable.c +++ b/Src/hashtable.c @@ -1232,7 +1232,7 @@ fillnameddirtable(HashTable ht) #if defined(HAVE_NIS) || defined(HAVE_NIS_PLUS) FILE *pwf; char buf[BUFSIZ], *p, *d, *de; - int skipping; + int skipping, oldct = nameddirtab->ct, usepwf = 1; # ifndef HAVE_NIS_PLUS char domain[YPMAXDOMAIN]; @@ -1250,28 +1250,48 @@ fillnameddirtable(HashTable ht) nis_list("passwd.org_dir", EXPAND_NAME|ALL_RESULTS|FOLLOW_LINKS|FOLLOW_PATH, add_userdir, 0); # endif - /* Don't forget the non-NIS matches from the flat passwd file */ - if ((pwf = fopen(PASSWD_FILE, "r")) != NULL) { - skipping = 0; - while (fgets(buf, BUFSIZ, pwf) != NULL) { - if (strchr(buf, '\n') != NULL) { - if (!skipping) { - if ((p = strchr(buf, ':')) != NULL) { - *p++ = '\0'; - if ((de = strrchr(p, ':'))) { - *de = '\0'; - if ((d = strrchr(p, ':'))) { - if (*++d && buf[0]) - adduserdir(buf, d, ND_USERNAME, 1); + if (nameddirtab->ct == oldct) { + /* Using NIS or NIS+ didn't add any user directories. This seems + * fishy, so we fall back to using getpwent(). If we don't have + * that, we only use the passwd file. */ +#ifdef HAVE_GETPWENT + struct passwd *pw; + + setpwent(); + + /* loop through the password file/database * + * and add all entries returned. */ + while ((pw = getpwent()) && !errflag) + adduserdir(pw->pw_name, pw->pw_dir, ND_USERNAME, 1); + + endpwent(); + usepwf = 0; +#endif /* HAVE_GETPWENT */ + } + if (usepwf) { + /* Don't forget the non-NIS matches from the flat passwd file */ + if ((pwf = fopen(PASSWD_FILE, "r")) != NULL) { + skipping = 0; + while (fgets(buf, BUFSIZ, pwf) != NULL) { + if (strchr(buf, '\n') != NULL) { + if (!skipping) { + if ((p = strchr(buf, ':')) != NULL) { + *p++ = '\0'; + if ((de = strrchr(p, ':'))) { + *de = '\0'; + if ((d = strrchr(p, ':'))) { + if (*++d && buf[0]) + adduserdir(buf, d, ND_USERNAME, 1); + } } } - } + } else + skipping = 0; } else - skipping = 0; - } else - skipping = 1; + skipping = 1; + } + fclose(pwf); } - fclose(pwf); } #else /* no NIS or NIS_PLUS */ #ifdef HAVE_GETPWENT |