From 845e49bdab36fc9e16b0e8440cfa0a427c240a21 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 7 Feb 2006 23:30:31 +0000 Subject: [PATCH] r13379: Andrew correctly noted that this breaks -s. Not sure what to do... (This used to be commit 5f9f772c2539112b17ebd13d7d3f4f7ab6fb141b) --- source3/rpcclient/rpcclient.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 4421e12054c..5e66b182630 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 -- 2.34.1