Sync with head...

(This used to be commit 60c83a6007085a8404b641b9783ae7b9c151e4ab)

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index ff231b9e602ba35a86165a6c101d1e8555d2d1df..e23140bdb00a6ef60bec31a35997c2f95c4cf93c 100644 (file)
--- 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;