d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow-up to revision 1.74: Using the result buffer to store our empty

Browse Source 
string was an incredibly dumb idea (of course it will be changed by an
NSS module on success!).  Use a static empty string instead.

Sponsored by:	DARPA, Network Associates Laboratories
This commit is contained in:
Jacques Vidrine 2003-04-18 22:07:30 +00:00
parent 3fcf3dd63a
commit 171614bfd6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=113694
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ int __pw_match_entry(const char *, size_t, enum nss_lookup_type,
const char *, uid_t);
int __pw_parse_entry(char *, size_t, struct passwd *, int, int *errnop);
static int pwd_init(struct passwd *, char *, size_t);
static void pwd_init(struct passwd *);
union key {
const char *name;
@ -268,10 +268,9 @@ getpwent_r(struct passwd *pwd, char *buffer, size_t bufsize,
};
int rv, ret_errno;
pwd_init(pwd);
ret_errno = 0;
*result = NULL;
ret_errno = pwd_init(pwd, buffer, bufsize);
if (ret_errno != 0)
return (ret_errno);
rv = _nsdispatch(result, dtab, NSDB_PASSWD, "getpwent_r", defaultsrc,
pwd, buffer, bufsize, &ret_errno);
if (rv == NS_SUCCESS)
@ -298,10 +297,9 @@ getpwnam_r(const char *name, struct passwd *pwd, char *buffer, size_t bufsize,
};
int rv, ret_errno;
pwd_init(pwd);
ret_errno = 0;
*result = NULL;
ret_errno = pwd_init(pwd, buffer, bufsize);
if (ret_errno != 0)
return (ret_errno);
rv = _nsdispatch(result, dtab, NSDB_PASSWD, "getpwnam_r", defaultsrc,
name, pwd, buffer, bufsize, &ret_errno);
if (rv == NS_SUCCESS)
@ -328,10 +326,9 @@ getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize,
};
int rv, ret_errno;
pwd_init(pwd);
ret_errno = 0;
*result = NULL;
ret_errno = pwd_init(pwd, buffer, bufsize);
if (ret_errno != 0)
return (ret_errno);
rv = _nsdispatch(result, dtab, NSDB_PASSWD, "getpwuid_r", defaultsrc,
uid, pwd, buffer, bufsize, &ret_errno);
if (rv == NS_SUCCESS)
@ -341,23 +338,20 @@ getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize,
}
static int
pwd_init(struct passwd *pwd, char *buffer, size_t bufsize)
static void
pwd_init(struct passwd *pwd)
{
static char nul[] = "";
if (bufsize < 1)
return (ERANGE);
buffer[0] = '\0';
memset(pwd, 0, sizeof(*pwd));
pwd->pw_uid = (uid_t)-1; /* Considered least likely to lead to */
pwd->pw_gid = (gid_t)-1; /* a security issue. */
pwd->pw_name = buffer;
pwd->pw_passwd = buffer;
pwd->pw_class = buffer;
pwd->pw_gecos = buffer;
pwd->pw_dir = buffer;
pwd->pw_shell = buffer;
return (0);
pwd->pw_name = nul;
pwd->pw_passwd = nul;
pwd->pw_class = nul;
pwd->pw_gecos = nul;
pwd->pw_dir = nul;
pwd->pw_shell = nul;
}