summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-04-28 07:05:50 +0000
committerTim Potter <tpot@samba.org>2003-04-28 07:05:50 +0000
commit9784320676b03c8a61525ed85816357e6a04c8ab (patch)
treee2c57237d2e0e4a03827a239b081a6313734a2a0
parent5bab7b987c1ace9f28e744d5de3b03b46c788a8c (diff)
downloadsamba-9784320676b03c8a61525ed85816357e6a04c8ab.tar.gz
samba-9784320676b03c8a61525ed85816357e6a04c8ab.tar.bz2
samba-9784320676b03c8a61525ed85816357e6a04c8ab.zip
Merge:
> Perform lp_load() before popt to fix -W option. (This used to be commit f8db590b07cabea3e199109bcdc26eaede189915)
-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())