From 33516ed8269b3b83d81f006608e14997a1d7dacd Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Fri, 18 Mar 2011 10:23:35 -0400 Subject: [PATCH] user_shell -> run_shell to avoid confusion with the user's SHELL variable. --- doc/sudo_plugin.pod | 2 +- plugins/sudoers/sudoers.c | 4 ++-- src/parse_args.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/sudo_plugin.pod b/doc/sudo_plugin.pod index 014bd0a79..570218088 100644 --- a/doc/sudo_plugin.pod +++ b/doc/sudo_plugin.pod @@ -192,7 +192,7 @@ C environment variable to the target user's home directory. Set to true if the user specified the C<-E> flag, indicating that 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 the user wishes to run a shell. diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c index 5c029c26f..603091833 100644 --- a/plugins/sudoers/sudoers.c +++ b/plugins/sudoers/sudoers.c @@ -1166,8 +1166,8 @@ deserialize_info(char * const settings[], char * const user_info[]) SET(flags, MODE_PRESERVE_ENV); continue; } - if (MATCHES(*cur, "user_shell=")) { - if (atobool(*cur + sizeof("user_shell=") - 1) == TRUE) + if (MATCHES(*cur, "run_shell=")) { + if (atobool(*cur + sizeof("run_shell=") - 1) == TRUE) SET(flags, MODE_SHELL); continue; } diff --git a/src/parse_args.c b/src/parse_args.c index efdf4e4ea..396515966 100644 --- a/src/parse_args.c +++ b/src/parse_args.c @@ -81,7 +81,7 @@ static struct sudo_settings { #define ARG_SET_HOME 5 { "set_home" }, #define ARG_USER_SHELL 6 - { "user_shell" }, + { "run_shell" }, #define ARG_LOGIN_SHELL 7 { "login_shell" }, #define ARG_IGNORE_TICKET 8 -- 2.40.0