* src/su.c: Avoid redeclaration of root_pw.
This commit is contained in:
parent
fe0a5b6ee3
commit
74073db5db
@ -1,3 +1,7 @@
|
||||
2009-05-10 Nicolas François <nicolas.francois@centraliens.net>
|
||||
|
||||
* src/su.c: Avoid redeclaration of root_pw.
|
||||
|
||||
2009-05-10 NAKANO Takeo <nakano@webmasters.gr.jp>
|
||||
|
||||
* po/ja.po: Updated Japanese translation.
|
||||
|
10
src/su.c
10
src/su.c
@ -460,16 +460,16 @@ int main (int argc, char **argv)
|
||||
}
|
||||
}
|
||||
if ('\0' == name[0]) { /* use default user */
|
||||
struct passwd *root_pw = getpwnam("root");
|
||||
struct passwd *root_pw = getpwnam ("root");
|
||||
if ((NULL != root_pw) && (0 == root_pw->pw_uid)) {
|
||||
(void) strcpy (name, "root");
|
||||
} else {
|
||||
struct passwd *root_pw = getpwuid(0);
|
||||
root_pw = getpwuid (0);
|
||||
if (NULL == root_pw) {
|
||||
SYSLOG((LOG_CRIT, "There is no UID 0 user."));
|
||||
su_failure(tty);
|
||||
SYSLOG ((LOG_CRIT, "There is no UID 0 user."));
|
||||
su_failure (tty);
|
||||
}
|
||||
(void) strcpy(name, root_pw->pw_name);
|
||||
(void) strcpy (name, root_pw->pw_name);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user