user_shell -> run_shell to avoid confusion with the user's SHELL variable.

This commit is contained in:
Todd C. Miller
2011-03-18 10:23:35 -04:00
parent 5d7889c0d7
commit 33516ed826
3 changed files with 4 additions and 4 deletions

View File

@@ -192,7 +192,7 @@ C<HOME> environment variable to the target user's home directory.
Set to true if the user specified the C<-E> flag, indicating that Set to true if the user specified the C<-E> flag, indicating that
the user wishes to preserve the environment. the user wishes to preserve the environment.
=item user_shell=bool =item run_shell=bool
Set to true if the user specified the C<-s> flag, indicating that Set to true if the user specified the C<-s> flag, indicating that
the user wishes to run a shell. the user wishes to run a shell.

View File

@@ -1166,8 +1166,8 @@ deserialize_info(char * const settings[], char * const user_info[])
SET(flags, MODE_PRESERVE_ENV); SET(flags, MODE_PRESERVE_ENV);
continue; continue;
} }
if (MATCHES(*cur, "user_shell=")) { if (MATCHES(*cur, "run_shell=")) {
if (atobool(*cur + sizeof("user_shell=") - 1) == TRUE) if (atobool(*cur + sizeof("run_shell=") - 1) == TRUE)
SET(flags, MODE_SHELL); SET(flags, MODE_SHELL);
continue; continue;
} }

View File

@@ -81,7 +81,7 @@ static struct sudo_settings {
#define ARG_SET_HOME 5 #define ARG_SET_HOME 5
{ "set_home" }, { "set_home" },
#define ARG_USER_SHELL 6 #define ARG_USER_SHELL 6
{ "user_shell" }, { "run_shell" },
#define ARG_LOGIN_SHELL 7 #define ARG_LOGIN_SHELL 7
{ "login_shell" }, { "login_shell" },
#define ARG_IGNORE_TICKET 8 #define ARG_IGNORE_TICKET 8