mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
parent
3a53724d1c
commit
a0f1bbdcb3
@ -591,7 +591,6 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd)
|
|||||||
static char *opt_authfile=NULL,
|
static char *opt_authfile=NULL,
|
||||||
*opt_username=NULL,
|
*opt_username=NULL,
|
||||||
*opt_domain=NULL,
|
*opt_domain=NULL,
|
||||||
*opt_configfile=NULL,
|
|
||||||
*opt_logfile=NULL,
|
*opt_logfile=NULL,
|
||||||
*opt_ipaddr=NULL;
|
*opt_ipaddr=NULL;
|
||||||
pstring logfile;
|
pstring logfile;
|
||||||
@ -604,15 +603,15 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd)
|
|||||||
poptContext pc;
|
poptContext pc;
|
||||||
struct poptOption long_options[] = {
|
struct poptOption long_options[] = {
|
||||||
POPT_AUTOHELP
|
POPT_AUTOHELP
|
||||||
{"authfile", 'A', POPT_ARG_STRING, &opt_authfile, 'A', "File containing user credentials"},
|
{"authfile", 'A', POPT_ARG_STRING, &opt_authfile, 'A', "File containing user credentials", "AUTHFILE"},
|
||||||
{"conf", 's', POPT_ARG_STRING, &opt_configfile, 's', "Specify an alternative config file"},
|
|
||||||
{"nopass", 'N', POPT_ARG_NONE, &got_pass, 'N', "Don't ask for a password"},
|
{"nopass", 'N', POPT_ARG_NONE, &got_pass, 'N', "Don't ask for a password"},
|
||||||
{"user", 'U', POPT_ARG_STRING, &opt_username, 'U', "Set the network username"},
|
{"user", 'U', POPT_ARG_STRING, &opt_username, 'U', "Set the network username", "USER"},
|
||||||
{"workgroup", 'W', POPT_ARG_STRING, &opt_domain, 'W', "Set the domain name for user account"},
|
{"workgroup", 'W', POPT_ARG_STRING, &opt_domain, 'W', "Set the domain name for user account", "DOMAIN"},
|
||||||
{"command", 'c', POPT_ARG_STRING, &cmdstr, 'c', "Execute semicolon separated cmds"},
|
{"command", 'c', POPT_ARG_STRING, &cmdstr, 'c', "Execute semicolon separated cmds", "COMMANDS"},
|
||||||
{"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l', "Logfile to use instead of stdout"},
|
{"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l', "Logfile to use instead of stdout", "LOGFILE" },
|
||||||
{"dest-ip", 'I', POPT_ARG_STRING, &opt_ipaddr, 'I', "Specify destination IP address"},
|
{"dest-ip", 'I', POPT_ARG_STRING, &opt_ipaddr, 'I', "Specify destination IP address", "IP"},
|
||||||
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
|
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
|
||||||
|
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -644,10 +643,6 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd)
|
|||||||
interactive = False;
|
interactive = False;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 's':
|
|
||||||
pstrcpy(dyn_CONFIGFILE, opt_configfile);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'U': {
|
case 'U': {
|
||||||
char *lp;
|
char *lp;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user