91 lines
3.3 KiB
Diff
91 lines
3.3 KiB
Diff
# HG changeset patch
|
|
# Parent 111fde52d1166af65b622da6eae19791ce0e8871
|
|
Reset valid_flags to MODE_NONINTERACTIVE for sudoedit.
|
|
This is consistent with how the -e option is handled.
|
|
Also reject -H and -P flags for sudoedit as was done in sudo 1.7.
|
|
Found by Qualys.
|
|
|
|
--- a/src/parse_args.c
|
|
+++ b/src/parse_args.c
|
|
@@ -114,7 +114,10 @@ struct environment {
|
|
/*
|
|
* Default flags allowed when running a command.
|
|
*/
|
|
-#define DEFAULT_VALID_FLAGS (MODE_BACKGROUND|MODE_PRESERVE_ENV|MODE_RESET_HOME|MODE_LOGIN_SHELL|MODE_NONINTERACTIVE|MODE_SHELL)
|
|
+#define DEFAULT_VALID_FLAGS (MODE_BACKGROUND|MODE_PRESERVE_ENV|MODE_RESET_HOME|MODE_LOGIN_SHELL|MODE_NONINTERACTIVE|MODE_PRESERVE_GROUPS|MODE_SHELL)
|
|
+#define EDIT_VALID_FLAGS MODE_NONINTERACTIVE
|
|
+#define LIST_VALID_FLAGS (MODE_NONINTERACTIVE|MODE_LONG_LIST)
|
|
+#define VALIDATE_VALID_FLAGS MODE_NONINTERACTIVE
|
|
|
|
/* Option number for the --host long option due to ambiguity of the -h flag. */
|
|
#define OPT_HOSTNAME 256
|
|
@@ -257,6 +260,7 @@ parse_args(int argc, char **argv, int *o
|
|
progname = "sudoedit";
|
|
mode = MODE_EDIT;
|
|
sudo_settings[ARG_SUDOEDIT].value = "true";
|
|
+ valid_flags = EDIT_VALID_FLAGS;
|
|
}
|
|
|
|
/* Load local IP addresses and masks. */
|
|
@@ -354,7 +358,7 @@ parse_args(int argc, char **argv, int *o
|
|
usage_excl();
|
|
mode = MODE_EDIT;
|
|
sudo_settings[ARG_SUDOEDIT].value = "true";
|
|
- valid_flags = MODE_NONINTERACTIVE;
|
|
+ valid_flags = EDIT_VALID_FLAGS;
|
|
break;
|
|
case 'g':
|
|
assert(optarg != NULL);
|
|
@@ -366,6 +370,7 @@ parse_args(int argc, char **argv, int *o
|
|
break;
|
|
case 'H':
|
|
sudo_settings[ARG_SET_HOME].value = "true";
|
|
+ SET(flags, MODE_RESET_HOME);
|
|
break;
|
|
case 'h':
|
|
if (optarg == NULL) {
|
|
@@ -420,7 +425,7 @@ parse_args(int argc, char **argv, int *o
|
|
usage_excl();
|
|
}
|
|
mode = MODE_LIST;
|
|
- valid_flags = MODE_NONINTERACTIVE|MODE_LONG_LIST;
|
|
+ valid_flags = LIST_VALID_FLAGS;
|
|
break;
|
|
case 'n':
|
|
SET(flags, MODE_NONINTERACTIVE);
|
|
@@ -428,6 +433,7 @@ parse_args(int argc, char **argv, int *o
|
|
break;
|
|
case 'P':
|
|
sudo_settings[ARG_PRESERVE_GROUPS].value = "true";
|
|
+ SET(flags, MODE_PRESERVE_GROUPS);
|
|
break;
|
|
case 'p':
|
|
/* An empty prompt is allowed. */
|
|
@@ -486,7 +492,7 @@ parse_args(int argc, char **argv, int *o
|
|
if (mode && mode != MODE_VALIDATE)
|
|
usage_excl();
|
|
mode = MODE_VALIDATE;
|
|
- valid_flags = MODE_NONINTERACTIVE;
|
|
+ valid_flags = VALIDATE_VALID_FLAGS;
|
|
break;
|
|
case 'V':
|
|
if (mode && mode != MODE_VERSION)
|
|
@@ -514,7 +520,7 @@ parse_args(int argc, char **argv, int *o
|
|
if (!mode) {
|
|
/* Defer -k mode setting until we know whether it is a flag or not */
|
|
if (sudo_settings[ARG_IGNORE_TICKET].value != NULL) {
|
|
- if (argc == 0 && !(flags & (MODE_SHELL|MODE_LOGIN_SHELL))) {
|
|
+ if (argc == 0 && !ISSET(flags, MODE_SHELL|MODE_LOGIN_SHELL)) {
|
|
mode = MODE_INVALIDATE; /* -k by itself */
|
|
sudo_settings[ARG_IGNORE_TICKET].value = NULL;
|
|
valid_flags = 0;
|
|
@@ -578,7 +584,7 @@ parse_args(int argc, char **argv, int *o
|
|
/*
|
|
* For shell mode we need to rewrite argv
|
|
*/
|
|
- if (ISSET(mode, MODE_RUN) && ISSET(flags, MODE_SHELL)) {
|
|
+ if (ISSET(flags, MODE_SHELL|MODE_LOGIN_SHELL) && ISSET(mode, MODE_RUN)) {
|
|
char **av, *cmnd = NULL;
|
|
int ac = 1;
|
|
|