diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-02-07 22:38:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:09:57 -0500 |
| commit | b2d98799e6e5449be5b34438db83087a67f7cf71 (patch) | |
| tree | 399a201f85e90f4d8f8079616613aeb30024bd98 /source3 | |
| parent | 3ad6e4d2790d8beea8227db3fe7ed05a9b0a2eeb (diff) | |
| download | samba-b2d98799e6e5449be5b34438db83087a67f7cf71.tar.gz samba-b2d98799e6e5449be5b34438db83087a67f7cf71.tar.bz2 samba-b2d98799e6e5449be5b34438db83087a67f7cf71.zip | |
r13378: Not sure what this breaks, but we have to do the popt processing after the
lp_load, because otherwise the lp_load overwrites the -W setting again.
Volker
(This used to be commit c7cc625d6360c1df2e4465d1d5ae792ff63a80de)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 5e66b18263..4421e12054 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -716,6 +716,16 @@ 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, @@ -750,16 +760,6 @@ 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 |