* src/chfn.c, src/chsh.c, src/groupdel.c, src/groupmems.c,
src/groupmod.c, src/grpck.c, src/login.c, src/logoutd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/suauth.c, src/useradd.c, src/userdel.c, src/usermod.c, src/vipw.c: Complete the switch from the `' quotation style to ''. Do it also in SYSLOG messages. Quote some parameters. All this permits to merge some messages.
This commit is contained in:
14
src/chsh.c
14
src/chsh.c
@@ -240,10 +240,10 @@ 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'", pw->pw_name));
|
||||
SYSLOG ((LOG_WARN, "can't change shell for '%s'", pw->pw_name));
|
||||
closelog ();
|
||||
fprintf (stderr,
|
||||
_("You may not change the shell for %s.\n"),
|
||||
_("You may not change the shell for '%s'.\n"),
|
||||
pw->pw_name);
|
||||
exit (1);
|
||||
}
|
||||
@@ -253,10 +253,10 @@ static void check_perms (const struct passwd *pw)
|
||||
* is not a restricted one.
|
||||
*/
|
||||
if (!amroot && is_restricted_shell (pw->pw_shell)) {
|
||||
SYSLOG ((LOG_WARN, "can't change shell for `%s'", pw->pw_name));
|
||||
SYSLOG ((LOG_WARN, "can't change shell for '%s'", pw->pw_name));
|
||||
closelog ();
|
||||
fprintf (stderr,
|
||||
_("You may not change the shell for %s.\n"),
|
||||
_("You may not change the shell for '%s'.\n"),
|
||||
pw->pw_name);
|
||||
exit (1);
|
||||
}
|
||||
@@ -268,10 +268,10 @@ 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'", pw->pw_name));
|
||||
SYSLOG ((LOG_WARN, "can't change shell for '%s'", pw->pw_name));
|
||||
closelog ();
|
||||
fprintf (stderr,
|
||||
_("You may not change the shell for %s.\n"),
|
||||
_("You may not change the shell for '%s'.\n"),
|
||||
pw->pw_name);
|
||||
exit (1);
|
||||
}
|
||||
@@ -537,7 +537,7 @@ int main (int argc, char **argv)
|
||||
|
||||
update_shell (user, loginsh);
|
||||
|
||||
SYSLOG ((LOG_INFO, "changed user `%s' shell to `%s'", user, loginsh));
|
||||
SYSLOG ((LOG_INFO, "changed user '%s' shell to '%s'", user, loginsh));
|
||||
|
||||
nscd_flush_cache ("passwd");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user