Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that _nis_start(&state) has been called before using PASSWD_BYNAME() 

or PASSWD_BYUID(), otherwise state.maptype won't be correct and the wrong
map may be selected (e.g., "passwd.by*" instead of "master.passwd.by*").

Set _PASSWORD_NOWARN in flags to __pw_scan(), so libc won't display parse
errors to stderr.  (This was the behaviour before my recent rototill.)

Fixes PR 27168 from Markus W Kilbinger.
This commit is contained in:
lukem 2004-10-07 06:11:24 +00:00
parent 9f506888d3
commit dd9512e81e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libc/gen/getpwent.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: getpwent.c,v 1.58 2004/10/05 12:09:23 lukem Exp $ */
/* $NetBSD: getpwent.c,v 1.59 2004/10/07 06:11:24 lukem Exp $ */
/*-
* Copyright (c) 1997-2000, 2004 The NetBSD Foundation, Inc.
@ -95,7 +95,7 @@
#if 0
static char sccsid[] = "@(#)getpwent.c 8.2 (Berkeley) 4/27/95";
#else
__RCSID("$NetBSD: getpwent.c,v 1.58 2004/10/05 12:09:23 lukem Exp $");
__RCSID("$NetBSD: getpwent.c,v 1.59 2004/10/07 06:11:24 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -192,7 +192,7 @@ _pw_parse(const char *entry, struct passwd *pw, char *buf, size_t buflen,
if (strlcpy(buf, entry, buflen) >= buflen)
return 0;
flags = 0;
flags = _PASSWORD_NOWARN;
if (old)
flags |= _PASSWORD_OLDFMT;
return __pw_scan(buf, pw, &flags);
@ -1360,6 +1360,9 @@ _nis_getpwuid_r(void *nsrv, void *nscb, va_list ap)
*result = NULL;
memset(&state, 0, sizeof(state));
rv = _nis_start(&state);
if (rv != NS_SUCCESS)
return rv;
snprintf(buffer, buflen, "%u", (unsigned int)uid);
rv = _nis_pwscan(retval, pw, buffer, buflen,
&state, PASSWD_BYUID(&state));
@ -1421,6 +1424,9 @@ _nis_getpwnam_r(void *nsrv, void *nscb, va_list ap)
*result = NULL;
snprintf(buffer, buflen, "%s", name);
memset(&state, 0, sizeof(state));
rv = _nis_start(&state);
if (rv != NS_SUCCESS)
return rv;
rv = _nis_pwscan(retval, pw, buffer, buflen,
&state, PASSWD_BYNAME(&state));
_nis_end(&state);