Author: gd Date: 2005-08-02 19:46:11 +0000 (Tue, 02 Aug 2005) New Revision: 8937
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8937 Log: allow to use non-default smb.conf in rpcclient Guenther Modified: branches/SAMBA_3_0/source/rpcclient/rpcclient.c trunk/source/rpcclient/rpcclient.c Changeset: Modified: branches/SAMBA_3_0/source/rpcclient/rpcclient.c =================================================================== --- branches/SAMBA_3_0/source/rpcclient/rpcclient.c 2005-08-02 19:38:30 UTC (rev 8936) +++ branches/SAMBA_3_0/source/rpcclient/rpcclient.c 2005-08-02 19:46:11 UTC (rev 8937) @@ -667,11 +667,6 @@ 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 @@ 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 Modified: trunk/source/rpcclient/rpcclient.c =================================================================== --- trunk/source/rpcclient/rpcclient.c 2005-08-02 19:38:30 UTC (rev 8936) +++ trunk/source/rpcclient/rpcclient.c 2005-08-02 19:46:11 UTC (rev 8937) @@ -671,11 +671,6 @@ 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, @@ -715,6 +710,11 @@ 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
