diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-06-13 08:12:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:06 -0500 |
| commit | 2b4791ae733488845b2c36bca64db695203de571 (patch) | |
| tree | e6c3836a90b412e61b10d30f3b256092b46811c7 /source4/client | |
| parent | 8fd5825a890db4f08966e4b262b03fb7868cc4c2 (diff) | |
| download | samba-2b4791ae733488845b2c36bca64db695203de571.tar.gz samba-2b4791ae733488845b2c36bca64db695203de571.tar.bz2 samba-2b4791ae733488845b2c36bca64db695203de571.zip | |
r7525: Unify lp_load(), load_interfaces and logging setup into popt().
There is now a new --debug-stderr option to enable debug to STDERR.
popt isn't perfect, but the callbacks are used in all the main Samba
binaries, and should be used in the rest. This avoids duplicated
code, and ensures every binary is setup correctly.
This also ensures the setup happens early enough to have -s function,
and have a correct impact on the credentials code. (Fixing a bug that
frustrated tridge earlier today).
The only 'subtle' aspect of all this is that I'm pretty sure that the
SAMBA_COMMON popt code must be above the CREDENTIALS code, in the
popt tables.
Andrew Bartlett
(This used to be commit 50f3c2b3a22971f40e0d3a88127b5120bfc47591)
Diffstat (limited to 'source4/client')
| -rw-r--r-- | source4/client/client.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 34d0fc20f1..afdab5928c 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3361,18 +3361,12 @@ static void remember_query_host(const char *arg, *query_host = 0; *base_directory = 0; - setup_logging(argv[0],DEBUG_STDOUT); mem_ctx = talloc_init("client.c/main"); if (!mem_ctx) { d_printf("\nclient.c: Not enough memory\n"); exit(1); } - if (!lp_load(dyn_CONFIGFILE,True,False,False)) { - fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n", - argv[0], dyn_CONFIGFILE); - } - pc = poptGetContext("smbclient", argc, (const char **) argv, long_options, 0); poptSetOtherOptionHelp(pc, "[OPTIONS] service <password>"); @@ -3393,10 +3387,6 @@ static void remember_query_host(const char *arg, case 'I': dest_ip = poptGetOptArg(pc); break; - case 'E': - setup_logging("client", DEBUG_STDERR); - break; - case 'L': remember_query_host(poptGetOptArg(pc), query_host); break; @@ -3412,8 +3402,6 @@ static void remember_query_host(const char *arg, } } - load_interfaces(); - smbclient_init_subsystems; if(poptPeekArg(pc)) { |