diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-04-08 23:42:08 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-04-08 23:42:08 +0000 |
commit | c131718ccc1db101df54fb04f34f5611c3678450 (patch) | |
tree | 14fd2f6b9e1cc7f3cfbf03da2f95bb56c8be94af /nis/nss_compat/compat-pwd.c | |
parent | 26dee9c49cbbec8826db4c29e99fb50d9392a047 (diff) | |
download | glibc-c131718ccc1db101df54fb04f34f5611c3678450.zip glibc-c131718ccc1db101df54fb04f34f5611c3678450.tar.gz glibc-c131718ccc1db101df54fb04f34f5611c3678450.tar.bz2 |
Update.cvs/libc-ud-970408
1997-04-09 01:24 Ulrich Drepper <drepper@cygnus.com>
* rellns-sh: Rewrite to work also in presence of symlinks.
* arpg/argp-fmtstream.c: Add casts to prevent warnings.
* argp/argp-fmtstream.h: Likewise.
* argp/argp-help.c: Likewise.
* elf/dl-minimal.c: Add definition of calloc.
* elf/version.c: Add casts to prevent warnings.
(_dl_check_map_versions): Use calloc instead of malloc+memset.
* locale/setlocale.c (_nl_current): Add element with index LC_ALL.
Reported by Greg McGary <gkm@eng.ascend.com>.
* manual/libc.texinfo: Update malloc documentation for new malloc.
* manual/memory.texi: Likewise.
Patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.
* math/libm-test.c (check_long): New function.
(check_longlong): New function.
(rinttol_test): New function.
(rinttoll_test): New function.
* nis/nss_compat/compat-grp.c (in_blacklist): Improve a bit.
* nis/nss_compat/compat-pwd.c: Likewise.
* nis/nss_compat/compat-spwd.c: Likewise.
* stdlib/erand48_r.c (erand48_r): Build double value using
ieee754_double union and use random bits in different order to
increase effect of seed.
Reported by David Mosberger-Tang <davidm@AZStarNet.com>.
* sunrpc/svc_auth.c: Moved to ...
* sysdeps/generic/svc_auth.c: ...here.
* time/time.h: Pretty print.
1997-04-08 07:19 H.J. Lu <hjl@gnu.ai.mit.edu>
* libio/genops.c (_IO_flush_all_linebuffered): don't flush on
a read-only stream.
1997-04-09 01:19 Ulrich Drepper <drepper@cygnus.com>
* malloc/malloc.c (mALLOC_STATs) [MALLOC_DEBUG>1]: Put declaration
in correct place.
Patch by Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>.
1997-04-07 15:34 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/Makefile (tests): Add tst-ferror.
* stdio-common/tst-ferror.c: New file. Some tests for error
indicator of streams.
* stdio-common/tst-ferror.input: New file.
* isomac.c: Let tests not fail because the compiler defines itself
symbols which violate the name space rules. gcc defines symbols
for the architecture which are not protected by an underscore
character.
* math/Makefile (libm-support): Add s_rinttol and s_rinttoll.
(libm-calls): Add s_clog.
* sysdeps/libm-ieee754/s_clog.c: New file. Implementation of
logarithm of complex value.
* sysdeps/libm-ieee754/s_clogf.c: New file.
* sysdeps/libm-ieee754/s_clogl.c: New file.
* math/libm-test.c (clog_test): Compile this function. Fix a few
typos.
(main): Call clog_test.
* sysdeps/libm-ieee754/s_rinttol.c: New file. Round long double
value to long int.
* sysdeps/libm-i387/s_rinttol.S: New file.
* sysdeps/libm-ieee754/s_rinttoll.c: new file. Round long double
value to long long int.
* sysdeps/libm-i387/s_rinttoll.S: New file.
* sysdeps/libm-ieee754/s_rintl.c: Many corrections. The previous
version was full of errors.
* math/math.h (rinttol): Argument is of type `long double' not
`double'.
(rinttoll): Likewise.
(roundtol): Likewise.
(roundtoll): Likewise.
1997-04-06 11:32 H.J. Lu <hjl@gnu.ai.mit.edu>
* posix/getopt.c (_getopt_initialize): Preserve optind.
(_getopt_internal): Set optind to 1 if optind == 0 before
calling _getopt_initialize ().
1997-04-05 16:45 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/rpcsvc/nislib.h: Change const nis_name to new type
const_nis_name.
* nis/nis_intern.c: Likewise.
* nis/nis_intern.h: Likewise.
* nis/nis_server.c: Likewise.
* nis/nis_subr.c: Likewise.
* nis/nis_table.c: Likewise.
* nis/nis_names.c: Likewise. Fill out ns_request structure in
nis_add().
* nis/nss_compat/compat-pwd.c: Use reentrant netgroup functions.
* nis/nss_compat/compat-spwd.c: Likewise.
1997-03-27 07:37 H.J. Lu <hjl@gnu.ai.mit.edu>
* libio/fileops.c (_IO_file_overflow): Set error when try to write
on a read-only stream.
* sysdeps/gnu/utmpbits.h (ut_xtime): New symbol.
(ut_time): Define it only if _NO_UT_TIME is not defined.
1997-04-06 00:42 Ulrich Drepper <drepper@cygnus.com>
* misc/tst-tsearch.c: Include <string.h>. Define _GNU_SOURCE only
if not already defined.
1997-04-05 16:14 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/netatalk/at.h: Include <sys/socket.h> to
get definition of sa_family_t for <linux/atalk.h>.
Reported by a sun <asun@zoology.washington.edu>.
* malloc/malloc.c (cALLOc): Little optimization.
Diffstat (limited to 'nis/nss_compat/compat-pwd.c')
-rw-r--r-- | nis/nss_compat/compat-pwd.c | 74 |
1 files changed, 41 insertions, 33 deletions
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 317e2d1..1a80355 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -321,7 +321,7 @@ getpwent_next_nis_netgr (struct passwd *result, ent_t *ent, char *group, char *ypdomain, *host, *user, *domain, *outval, *p, *p2; int status, outvallen; size_t p2len; - + if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS) { ent->netgroup = 0; @@ -390,8 +390,8 @@ getpwent_next_nisplus_netgr (struct passwd *result, ent_t *ent, char *group, int status, parse_res; size_t p2len; nis_result *nisres; - - /* Maybe we should use domainname here ? We need the current + + /* Maybe we should use domainname here ? We need the current domainname for the domain field in netgroups */ if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS) { @@ -434,7 +434,7 @@ getpwent_next_nisplus_netgr (struct passwd *result, ent_t *ent, char *group, } p2 = buffer + (buflen - p2len); buflen -= p2len; - { + { char buf[strlen (user) + 30]; sprintf(buf, "[name=%s],passwd.org_dir", user); nisres = nis_list(buf, EXPAND_NAME, NULL, NULL); @@ -446,7 +446,7 @@ getpwent_next_nisplus_netgr (struct passwd *result, ent_t *ent, char *group, } parse_res = _nss_nisplus_parse_pwent (nisres, result, buffer, buflen); nis_freeresult (nisres); - + if (parse_res) { copy_pwd_changes (result, &ent->pwd, p2, p2len); @@ -484,7 +484,7 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer, return NSS_STATUS_UNAVAIL; } } - + p2len = pwd_need_buflen (&ent->pwd); if (p2len > buflen) { @@ -510,8 +510,8 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer, else { nis_result *res; - - res = nis_next_entry(ent->names[ent->names_nr], + + res = nis_next_entry(ent->names[ent->names_nr], &ent->result->cookie); nis_freeresult (ent->result); ent->result = res; @@ -532,16 +532,16 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer, } } } - parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer, + parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer, buflen); - if (parse_res && + if (parse_res && in_blacklist (result->pw_name, strlen (result->pw_name), ent)) parse_res = 0; /* if result->pw_name in blacklist,search next entry */ } while (!parse_res); - + copy_pwd_changes (result, &ent->pwd, p2, p2len); - + return NSS_STATUS_SUCCESS; } @@ -623,7 +623,7 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, /* This function handle the +user entrys in /etc/passwd */ static enum nss_status -getpwent_next_file_plususer (struct passwd *result, char *buffer, +getpwent_next_file_plususer (struct passwd *result, char *buffer, size_t buflen) { struct parser_data *data = (void *) buffer; @@ -631,11 +631,11 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer, int parse_res; char *p; size_t plen; - + memset (&pwd, '\0', sizeof (struct passwd)); - + copy_pwd_changes (&pwd, result, NULL, 0); - + plen = pwd_need_buflen (&pwd); if (plen > buflen) { @@ -644,19 +644,19 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer, } p = buffer + (buflen - plen); buflen -= plen; - + if (use_nisplus) /* Do the NIS+ query here */ { nis_result *res; char buf[strlen (result->pw_name) + 24]; - + sprintf(buf, "[name=%s],passwd.org_dir", &result->pw_name[1]); res = nis_list(buf, EXPAND_NAME, NULL, NULL); if (niserr2nss (res->status) != NSS_STATUS_SUCCESS) { enum nss_status status = niserr2nss (res->status); - + nis_freeresult (res); return status; } @@ -668,22 +668,22 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer, char *domain; char *outval; int outvallen; - + if (yp_get_default_domain (&domain) != YPERR_SUCCESS) return NSS_STATUS_TRYAGAIN; - + if (yp_match (domain, "passwd.byname", &result->pw_name[1], strlen (result->pw_name) - 1, &outval, &outvallen) != YPERR_SUCCESS) return NSS_STATUS_TRYAGAIN; - p = strncpy (buffer, outval, + p = strncpy (buffer, outval, buflen < outvallen ? buflen : outvallen); free (outval); while (isspace (*p)) p++; parse_res = _nss_files_parse_pwent (p, result, data, buflen); } - + if (parse_res) { copy_pwd_changes (result, &pwd, p, plen); @@ -735,15 +735,19 @@ getpwent_next_file (struct passwd *result, ent_t *ent, if (result->pw_name[0] == '-' && result->pw_name[1] == '@' && result->pw_name[2] != '\0') { + char buf2[1024]; char *user, *host, *domain; + struct __netgrent netgrdata; - setnetgrent (&result->pw_name[2]); - while (getnetgrent (&host, &user, &domain)) + bzero (&netgrdata, sizeof (struct __netgrent)); + __internal_setnetgrent (&result->pw_name[2], &netgrdata); + while (__internal_getnetgrent_r (&host, &user, &domain, + &netgrdata, buf2, sizeof (buf2))) { if (user != NULL && user[0] != '-') blacklist_store_name (user, ent); } - endnetgrent (); + __internal_endnetgrent (&netgrdata); continue; } @@ -778,7 +782,7 @@ getpwent_next_file (struct passwd *result, ent_t *ent, && result->pw_name[1] != '@') { enum nss_status status; - + status = getpwent_next_file_plususer (result, buffer, buflen); if (status == NSS_STATUS_SUCCESS) /* We found the entry. */ break; @@ -879,7 +883,7 @@ _nss_compat_getpwnam_r (const char *name, struct passwd *pwd, __nss_database_lookup ("passwd_compat", NULL, "nis", &ni); use_nisplus = (strcmp (ni->name, "nisplus") == 0); } - + __libc_lock_unlock (lock); status = internal_setpwent (&ent); @@ -903,17 +907,17 @@ _nss_compat_getpwuid_r (uid_t uid, struct passwd *pwd, ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0}, {NULL, NULL, 0, 0, NULL, NULL, NULL}}; enum nss_status status; - + __libc_lock_lock (lock); - + if (ni == NULL) { __nss_database_lookup ("passwd_compat", NULL, "nis", &ni); use_nisplus = (strcmp (ni->name, "nisplus") == 0); } - + __libc_lock_unlock (lock); - + status = internal_setpwent (&ent); if (status != NSS_STATUS_SUCCESS) return status; @@ -979,10 +983,14 @@ static bool_t in_blacklist (const char *name, int namelen, ent_t *ent) { char buf[namelen + 3]; + char *cp; if (ent->blacklist.data == NULL) return FALSE; - stpcpy (stpcpy (stpcpy (buf, "|"), name), "|"); + buf[0] = '|'; + cp = stpcpy (&buf[1], name); + *cp++= '|'; + *cp = '\0'; return strstr (ent->blacklist.data, buf) != NULL; } |