shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-31 16:21:11 +03:00
Code

use re-entrant variants of getpwnam and getgrnam

Browse Source 
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
This commit is contained in:
Alan Jenkins 2008-10-22 15:13:08 +01:00 committed by Kay Sievers
parent 14f4025607
commit aaff3d023f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
udev/udev-util.c
View File

@ -126,13 +126,16 @@ int util_unlink_secure(struct udev *udev, const char *filename)
uid_t util_lookup_user(struct udev *udev, const char *user) uid_t util_lookup_user(struct udev *udev, const char *user)
{ {
int buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
char buf[buflen];
struct passwd pwbuf;
struct passwd *pw; struct passwd *pw;
uid_t uid = 0; uid_t uid = 0;
if (strcmp(user, "root") == 0) if (strcmp(user, "root") == 0)
return 0; return 0;
errno = 0; errno = 0;
pw = getpwnam(user); getpwnam_r(user, &pwbuf, buf, buflen, &pw);
if (pw == NULL) { if (pw == NULL) {
if (errno == 0 || errno == ENOENT || errno == ESRCH) if (errno == 0 || errno == ENOENT || errno == ESRCH)
err(udev, "specified user '%s' unknown\n", user); err(udev, "specified user '%s' unknown\n", user);
@ -140,18 +143,22 @@ uid_t util_lookup_user(struct udev *udev, const char *user)
err(udev, "error resolving user '%s': %m\n", user); err(udev, "error resolving user '%s': %m\n", user);
} else } else
uid = pw->pw_uid; uid = pw->pw_uid;
return uid; return uid;
} }
extern gid_t util_lookup_group(struct udev *udev, const char *group) extern gid_t util_lookup_group(struct udev *udev, const char *group)
{ {
int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
char buf[buflen];
struct group grbuf;
struct group *gr; struct group *gr;
gid_t gid = 0; gid_t gid = 0;
if (strcmp(group, "root") == 0) if (strcmp(group, "root") == 0)
return 0; return 0;
errno = 0; errno = 0;
gr = getgrnam(group); getgrnam_r(group, &grbuf, buf, buflen, &gr);
if (gr == NULL) { if (gr == NULL) {
if (errno == 0 || errno == ENOENT || errno == ESRCH) if (errno == 0 || errno == ENOENT || errno == ESRCH)
err(udev, "specified group '%s' unknown\n", group); err(udev, "specified group '%s' unknown\n", group);