summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-02-07 23:30:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:09:57 -0500
commit845e49bdab36fc9e16b0e8440cfa0a427c240a21 (patch)
tree71045d0d6dc0350eefd9d2eccb579e7ceb8111d3
parentb2d98799e6e5449be5b34438db83087a67f7cf71 (diff)
downloadsamba-845e49bdab36fc9e16b0e8440cfa0a427c240a21.tar.gz
samba-845e49bdab36fc9e16b0e8440cfa0a427c240a21.tar.bz2
samba-845e49bdab36fc9e16b0e8440cfa0a427c240a21.zip
r13379: Andrew correctly noted that this breaks -s. Not sure what to do...
(This used to be commit 5f9f772c2539112b17ebd13d7d3f4f7ab6fb141b)
-rw-r--r--source3/rpcclient/rpcclient.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 4421e12054..5e66b18263 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/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