emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/su.c: If there are no root account, or if the root account

Browse Source 
has an UID != 0, default to the first UID 0 account.
This commit is contained in:
nekral-guest 2009-04-12 00:28:32 +00:00
parent 08a212ccae
commit 6b46161f2d
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-04-12 Nicolas François <nicolas.francois@centraliens.net>
* src/su.c: If there are no root account, or if the root account
has an UID != 0, default to the first UID 0 account.
2009-04-12 Nicolas François <nicolas.francois@centraliens.net> 2009-04-12 Nicolas François <nicolas.francois@centraliens.net>
* src/login.c: Restore the echoctl, echoke, onclr flags to the * src/login.c: Restore the echoctl, echoke, onclr flags to the

14
src/su.c
View File

@ -305,7 +305,7 @@ static void usage (void)
* su - switch user id * su - switch user id
* *
* su changes the user's ids to the values for the specified user. if * su changes the user's ids to the values for the specified user. if
* no new user name is specified, "root" is used by default. * no new user name is specified, "root" or UID 0 is used by default.
* *
* Any additional arguments are passed to the user's shell. In * Any additional arguments are passed to the user's shell. In
* particular, the argument "-c" will cause the next argument to be * particular, the argument "-c" will cause the next argument to be
@ -457,8 +457,18 @@ int main (int argc, char **argv)
optind++; optind++;
} }
} }
if ('\0' == name[0]) { /* use default user ID */ if ('\0' == name[0]) { /* use default user */
struct passwd *root_pw = getpwnam("root");
if ((NULL != root_pw) && (0 == root_pw->pw_uid)) {
(void) strcpy (name, "root"); (void) strcpy (name, "root");
} else {
struct passwd *root_pw = getpwuid(0);
if (NULL == root_pw) {
SYSLOG((LOG_CRIT, "There is no UID 0 user."));
su_failure(tty);
}
(void) strcpy(name, root_pw->pw_name);
}
} }
doshell = (argc == optind); /* any arguments remaining? */ doshell = (argc == optind); /* any arguments remaining? */