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

Make "-h hostname" work. Optional args in GNU getopt() only work

Browse Source 
when there is no space between the option flag and the argument.
This commit is contained in:
Todd C. Miller
2013-07-18 10:02:43 -06:00
parent 9309c9eab7
commit db05b9ae0d
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/parse_args.c
View File

@@ -118,6 +118,11 @@ static struct sudo_settings {
{ NULL } { NULL }
}; };
/*
* 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)
/* /*
* Command line argument parsing. * Command line argument parsing.
* Sets nargc and nargv which corresponds to the argc/argv we'll use * Sets nargc and nargv which corresponds to the argc/argv we'll use
@@ -129,8 +134,8 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv, char ***settingsp,
{ {
int mode = 0; /* what mode is sudo to be run in? */ int mode = 0; /* what mode is sudo to be run in? */
int flags = 0; /* mode flags */ int flags = 0; /* mode flags */
int valid_flags, ch; int valid_flags = DEFAULT_VALID_FLAGS;
int i, j; int ch, i, j;
char *cp, **env_add, **settings; char *cp, **env_add, **settings;
const char *runas_user = NULL; const char *runas_user = NULL;
const char *runas_group = NULL; const char *runas_group = NULL;
@@ -166,6 +171,10 @@ 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 "--" */
#define got_host_flag (optind > 1 && argv[optind - 1][0] == '-' && \
argv[optind - 1][1] == 'h' && argv[optind - 1][2] == '\0')
/* Returns true if the last option string was "--" */ /* Returns true if the last option string was "--" */
#define got_end_of_args (optind > 1 && argv[optind - 1][0] == '-' && \ #define got_end_of_args (optind > 1 && argv[optind - 1][0] == '-' && \
argv[optind - 1][1] == '-' && argv[optind - 1][2] == '\0') argv[optind - 1][1] == '-' && argv[optind - 1][2] == '\0')
@@ -174,9 +183,6 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv, char ***settingsp,
#define is_envar (optind < argc && argv[optind][0] != '/' && \ #define is_envar (optind < argc && argv[optind][0] != '/' && \
strchr(argv[optind], '=') != NULL) strchr(argv[optind], '=') != NULL)
/* Flags allowed when running a command */
valid_flags = MODE_BACKGROUND|MODE_PRESERVE_ENV|MODE_RESET_HOME|
MODE_LOGIN_SHELL|MODE_NONINTERACTIVE|MODE_SHELL;
/* XXX - should fill in settings at the end to avoid dupes */ /* XXX - should fill in settings at the end to avoid dupes */
for (;;) { for (;;) {
/* /*
@@ -312,6 +318,18 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv, char ***settingsp,
default: default:
usage(1); usage(1);
} }
} else if (got_host_flag) {
/*
* 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;
@@ -579,6 +597,8 @@ help(void)
_("set HOME variable to target user's home dir.\n")); _("set HOME variable to target user's home dir.\n"));
lbuf_append(&lbuf, " -h %s", lbuf_append(&lbuf, " -h %s",
_("display help message and exit\n")); _("display help message and exit\n"));
lbuf_append(&lbuf, " -h host name %s",
_("run command on specified host if supported\n"));
lbuf_append(&lbuf, " -i [command] %s", lbuf_append(&lbuf, " -i [command] %s",
_("run a login shell as target user\n")); _("run a login shell as target user\n"));
lbuf_append(&lbuf, " -K %s", lbuf_append(&lbuf, " -K %s",