diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2002-10-05 16:45:54 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2002-10-05 16:45:54 +0000 |
| commit | 272fee58094f4a10ffc978b4f90c444a99a6e945 (patch) | |
| tree | 664dc24910b70f809c203413a50c592cb697e191 /source3/rpcclient | |
| parent | 222075ee279309ce6dec414d8c5018f35aab1044 (diff) | |
| download | samba-272fee58094f4a10ffc978b4f90c444a99a6e945.tar.gz samba-272fee58094f4a10ffc978b4f90c444a99a6e945.tar.xz samba-272fee58094f4a10ffc978b4f90c444a99a6e945.zip | |
Update popt help message and use popt-common
(This used to be commit 821b27037b991e143b87f0f1c7186c9a403376f0)
Diffstat (limited to 'source3/rpcclient')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index c34f3b08ad9..5aa8d2359f1 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; |