Skip to content

Adjust parser ordering to error out on invalid names #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+13 −11
Closed

Adjust parser ordering to error out on invalid names #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions su-exec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ int main(int argc, char *argv[])

struct passwd *pw = NULL;
if (user[0] != '\0') {
pw = getpwnam(user);
uid_t nuid = strtol(user, &end, 10);
if (*end == '\0')
uid = nuid;
else {
pw = getpwnam(user);
if (pw == NULL)
err(1, "getpwnam(%s)", user);
}
}
if (pw == NULL) {
pw = getpwuid(uid);
Expand All @@ -59,17 +63,15 @@ int main(int argc, char *argv[])
/* group was specified, ignore grouplist for setgroups later */
pw = NULL;

struct group *gr = getgrnam(group);
if (gr == NULL) {
gid_t ngid = strtol(group, &end, 10);
if (*end == '\0') {
gr = getgrgid(ngid);
if (gr == NULL)
gid = ngid;
}
}
if (gr != NULL)
gid_t ngid = strtol(group, &end, 10);
if (*end == '\0')
gid = ngid;
else {
struct group *gr = getgrnam(group);
if (gr == NULL)
err(1, "getgrnam(%s)", group);
gid = gr->gr_gid;
}
}

if (pw == NULL) {
Expand Down