From 37091831271f1cd52a0999bd6bb9268e60ca6cf6 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Mon, 31 Dec 2007 15:13:39 +0000 Subject: [PATCH] (compil fix) Use pw->pw_name instead of user. --- src/chsh.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/chsh.c b/src/chsh.c index f6c3f624..707f2f99 100644 --- a/src/chsh.c +++ b/src/chsh.c @@ -235,10 +235,11 @@ static void check_perms (const struct passwd *pw) * UID of the user matches the current real UID. */ 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 (); 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); } @@ -247,10 +248,11 @@ static void check_perms (const struct passwd *pw) * is not a restricted one. */ 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 (); 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); } #ifdef WITH_SELINUX @@ -261,10 +263,11 @@ static void check_perms (const struct passwd *pw) if ((pw->pw_uid != getuid ()) && (is_selinux_enabled () > 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 (); 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); } #endif