summaryrefslogtreecommitdiffstats
path: root/source/rpcclient
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-02-07 23:30:31 +0000
committerVolker Lendecke <vlendec@samba.org>2006-02-07 23:30:31 +0000
commit5088ddd577198265c683824f46f9400da40dd9c6 (patch)
treeeb3d11c147c064d0dad349e82d2a2eb4e7e390ba /source/rpcclient
parentc1de2782c4f122a92f749f627b00248ceab17acc (diff)
downloadsamba-5088ddd577198265c683824f46f9400da40dd9c6.tar.gz
samba-5088ddd577198265c683824f46f9400da40dd9c6.tar.xz
samba-5088ddd577198265c683824f46f9400da40dd9c6.zip
r13379: Andrew correctly noted that this breaks -s. Not sure what to do...
Diffstat (limited to 'source/rpcclient')
-rw-r--r--source/rpcclient/rpcclient.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/source/rpcclient/rpcclient.c b/source/rpcclient/rpcclient.c
index 4421e12054c..5e66b182630 100644
--- a/source/rpcclient/rpcclient.c
+++ b/source/rpcclient/rpcclient.c
@@ -716,16 +716,6 @@ out_free:
if (!interactive)
reopen_logs();
- load_interfaces();
-
- if (!init_names())
- return 1;
-
- /* Load smb.conf file */
-
- if (!lp_load(dyn_CONFIGFILE,True,False,False,True))
- fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
-
/* Parse options */
pc = poptGetContext("rpcclient", argc, (const char **) argv,
@@ -760,6 +750,16 @@ out_free:
poptFreeContext(pc);
+ load_interfaces();
+
+ if (!init_names())
+ return 1;
+
+ /* Load smb.conf file */
+
+ if (!lp_load(dyn_CONFIGFILE,True,False,False,True))
+ fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
+
/*
* Get password
* from stdin if necessary