summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2002-10-28 19:45:47 +0000
committerJelmer Vernooij <jelmer@samba.org>2002-10-28 19:45:47 +0000
commita0f1bbdcb3b3ab53b99d18ee717333d06ec16c0e (patch)
tree406b62f80c934a8c23d6d69dc97ac42c29950805
parent3a53724d1cf9bf174c2d944e1b5a677283aed255 (diff)
downloadsamba-a0f1bbdcb3b3ab53b99d18ee717333d06ec16c0e.tar.gz
samba-a0f1bbdcb3b3ab53b99d18ee717333d06ec16c0e.tar.bz2
samba-a0f1bbdcb3b3ab53b99d18ee717333d06ec16c0e.zip
Sync with head...
(This used to be commit 60c83a6007085a8404b641b9783ae7b9c151e4ab)
-rw-r--r--source3/rpcclient/rpcclient.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index ff231b9e60..e23140bdb0 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -591,7 +591,6 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd)
static char *opt_authfile=NULL,
*opt_username=NULL,
*opt_domain=NULL,
- *opt_configfile=NULL,
*opt_logfile=NULL,
*opt_ipaddr=NULL;
pstring logfile;
@@ -604,15 +603,15 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd)
poptContext pc;
struct poptOption long_options[] = {
POPT_AUTOHELP
- {"authfile", 'A', POPT_ARG_STRING, &opt_authfile, 'A', "File containing user credentials"},
- {"conf", 's', POPT_ARG_STRING, &opt_configfile, 's', "Specify an alternative config file"},
+ {"authfile", 'A', POPT_ARG_STRING, &opt_authfile, 'A', "File containing user credentials", "AUTHFILE"},
{"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"},
- {"workgroup", 'W', POPT_ARG_STRING, &opt_domain, 'W', "Set the domain name for user account"},
- {"command", 'c', POPT_ARG_STRING, &cmdstr, 'c', "Execute semicolon separated cmds"},
- {"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l', "Logfile to use instead of stdout"},
- {"dest-ip", 'I', POPT_ARG_STRING, &opt_ipaddr, 'I', "Specify destination IP address"},
+ {"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", "DOMAIN"},
+ {"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" },
+ {"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_configfile },
{ NULL }
};
@@ -644,10 +643,6 @@ static NTSTATUS process_cmd(struct cli_state *cli, char *cmd)
interactive = False;
break;
- case 's':
- pstrcpy(dyn_CONFIGFILE, opt_configfile);
- break;
-
case 'U': {
char *lp;