isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix parsing of "-h host" when used in conjunction with the -l flag.

Browse Source
This commit is contained in:
Todd C. Miller
2013-08-14 13:41:47 -06:00
parent 8b1d645534
commit 79104ce751
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/parse_args.c
View File

@@ -210,7 +210,7 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv, char ***settingsp,
sudo_settings[ARG_MAX_GROUPS].value = cp; sudo_settings[ARG_MAX_GROUPS].value = cp;
} }
/* Returns true if the last option string was "--" */ /* Returns true if the last option string was "-h" */
#define got_host_flag (optind > 1 && argv[optind - 1][0] == '-' && \ #define got_host_flag (optind > 1 && argv[optind - 1][0] == '-' && \
argv[optind - 1][1] == 'h' && argv[optind - 1][2] == '\0') argv[optind - 1][1] == 'h' && argv[optind - 1][2] == '\0')
@@ -275,6 +275,16 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv, char ***settingsp,
break; break;
case 'h': case 'h':
if (optarg == NULL) { if (optarg == NULL) {
/*
* Optional args support -hhostname, not -h hostname.
* If we see a non-option after the -h flag, treat as
* remote host and bump optind to skip over it.
*/
if (got_host_flag && !is_envar &&
argv[optind] != NULL && argv[optind][0] != '-') {
sudo_settings[ARG_REMOTE_HOST].value = argv[optind++];
continue;
}
if (mode && mode != MODE_HELP) { if (mode && mode != MODE_HELP) {
if (strcmp(getprogname(), "sudoedit") != 0) if (strcmp(getprogname(), "sudoedit") != 0)
usage_excl(1); usage_excl(1);
@@ -358,18 +368,6 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv, char ***settingsp,
default: default:
usage(1); usage(1);
} }
} else if (got_host_flag && optind < argc) {
/*
* Optional args only support -hhostname, not -h hostname.
* If we see a non-option after the -h flag, treat as
* remote host, clear help mode and reset valid_flags.
*/
mode = 0;
valid_flags = DEFAULT_VALID_FLAGS;
sudo_settings[ARG_REMOTE_HOST].value = argv[optind];
/* Crank optind and resume getopt. */
optind++;
} else if (!got_end_of_args && is_envar) { } else if (!got_end_of_args && is_envar) {
if (nenv == env_size - 2) { if (nenv == env_size - 2) {
env_size *= 2; env_size *= 2;