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

(compil fix) Use pw->pw_name instead of user.

Browse Source
This commit is contained in:
nekral-guest 2007-12-31 15:13:39 +00:00
parent 9a67b445b1
commit 3709183127
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/chsh.c
View File

@ -235,10 +235,11 @@ static void check_perms (const struct passwd *pw)
* UID of the user matches the current real UID. * UID of the user matches the current real UID.
*/ */
if (!amroot && pw->pw_uid != getuid ()) { if (!amroot && pw->pw_uid != getuid ()) {
SYSLOG ((LOG_WARN, "can't change shell for `%s'", user)); SYSLOG ((LOG_WARN, "can't change shell for `%s'", pw->pw_name));
closelog (); closelog ();
fprintf (stderr, fprintf (stderr,
_("You may not change the shell for %s.\n"), user); _("You may not change the shell for %s.\n"),
pw->pw_name);
exit (1); exit (1);
} }
@ -247,10 +248,11 @@ static void check_perms (const struct passwd *pw)
* is not a restricted one. * is not a restricted one.
*/ */
if (!amroot && restricted_shell (pw->pw_shell)) { if (!amroot && restricted_shell (pw->pw_shell)) {
SYSLOG ((LOG_WARN, "can't change shell for `%s'", user)); SYSLOG ((LOG_WARN, "can't change shell for `%s'", pw->pw_name));
closelog (); closelog ();
fprintf (stderr, fprintf (stderr,
_("You may not change the shell for %s.\n"), user); _("You may not change the shell for %s.\n"),
pw->pw_name);
exit (1); exit (1);
} }
#ifdef WITH_SELINUX #ifdef WITH_SELINUX
@ -261,10 +263,11 @@ static void check_perms (const struct passwd *pw)
if ((pw->pw_uid != getuid ()) if ((pw->pw_uid != getuid ())
&& (is_selinux_enabled () > 0) && (is_selinux_enabled () > 0)
&& (selinux_check_passwd_access (PASSWD__CHSH) != 0)) { && (selinux_check_passwd_access (PASSWD__CHSH) != 0)) {
SYSLOG ((LOG_WARN, "can't change shell for `%s'", user)); SYSLOG ((LOG_WARN, "can't change shell for `%s'", pw->pw_name));
closelog (); closelog ();
fprintf (stderr, fprintf (stderr,
_("You may not change the shell for %s.\n"), user); _("You may not change the shell for %s.\n"),
pw->pw_name);
exit (1); exit (1);
} }
#endif #endif