diff options
author | Günther Deschner <gd@samba.org> | 2005-08-02 19:46:11 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:00:21 -0500 |
commit | ad6d233adf62220e1c0c1492ba67cf00f341588e (patch) | |
tree | cc4063d21b1d4964d5152af473fb7403ea22bfed | |
parent | 850a6f3a8df23338b6f1cd2df66d4f7c3b8565e8 (diff) | |
download | samba-ad6d233adf62220e1c0c1492ba67cf00f341588e.tar.gz samba-ad6d233adf62220e1c0c1492ba67cf00f341588e.tar.bz2 samba-ad6d233adf62220e1c0c1492ba67cf00f341588e.zip |
r8937: allow to use non-default smb.conf in rpcclient
Guenther
(This used to be commit c0f3f12a6237842987845f4b4c787e25a632f2f5)
-rw-r--r-- | source3/rpcclient/rpcclient.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index feaeae4da6..3112db19ad 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -667,11 +667,6 @@ out_free: 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, @@ -711,6 +706,11 @@ out_free: if (!init_names()) return 1; + /* Load smb.conf file */ + + if (!lp_load(dyn_CONFIGFILE,True,False,False)) + fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE); + /* * Get password * from stdin if necessary |