summaryrefslogtreecommitdiff
path: root/source3/rpcclient
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-04-28 07:03:08 +0000
committerTim Potter <tpot@samba.org>2003-04-28 07:03:08 +0000
commitd31cb1b4684e7b3288d5841bf206379ba8149e8a (patch)
tree38d8701930dff8e34d9d320d7a07795491c4cd1a /source3/rpcclient
parenta2e4ac9eef9eba7eafbab8731f23a5146ee4221f (diff)
downloadsamba-d31cb1b4684e7b3288d5841bf206379ba8149e8a.tar.gz
samba-d31cb1b4684e7b3288d5841bf206379ba8149e8a.tar.bz2
samba-d31cb1b4684e7b3288d5841bf206379ba8149e8a.zip
Perform lp_load() before popt to fix -W option.
(This used to be commit d20f4bf5d84f435a7b4b692bf33f05f4ec871a50)
Diffstat (limited to 'source3/rpcclient')
-rw-r--r--source3/rpcclient/rpcclient.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 0411212e8c..b01e2d694c 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -537,6 +537,17 @@ out_free:
setlinebuf(stdout);
+ /* the following functions are part of the Samba debugging
+ facilities. See lib/debug.c */
+ setup_logging("rpcclient", interactive);
+ if (!interactive)
+ reopen_logs();
+
+ /* Load smb.conf file */
+
+ if (!lp_load(dyn_CONFIGFILE,True,False,False))
+ fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
+
/* Parse options */
pc = poptGetContext("rpcclient", argc, (const char **) argv,
@@ -571,17 +582,6 @@ out_free:
poptFreeContext(pc);
- /* the following functions are part of the Samba debugging
- facilities. See lib/debug.c */
- setup_logging("rpcclient", interactive);
- if (!interactive)
- reopen_logs();
-
- /* Load smb.conf file */
-
- if (!lp_load(dyn_CONFIGFILE,True,False,False))
- fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
-
load_interfaces();
if (!init_names())