sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Merge:

Browse Source 
> Perform lp_load() before popt to fix -W option.
(This used to be commit f8db590b07)
This commit is contained in:
Tim Potter 2003-04-28 07:05:50 +00:00
parent 5bab7b987c
commit 9784320676
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source3/rpcclient/rpcclient.c
View File

@ -537,6 +537,17 @@ out_free:
setlinebuf(stdout);
/* the following functions are part of the Samba debugging
facilities. See lib/debug.c */
setup_logging("rpcclient", interactive);
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,
@ -571,17 +582,6 @@ out_free:
poptFreeContext(pc);
/* the following functions are part of the Samba debugging
facilities. See lib/debug.c */
setup_logging("rpcclient", interactive);
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);
load_interfaces();
if (!init_names())