diff options
| author | Stefan Metzmacher <metze@samba.org> | 2016-12-09 16:04:38 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2016-12-20 01:11:25 +0100 |
| commit | 4fb0e65a857f601562da72c6d6087d86ba3196a0 (patch) | |
| tree | 1a2562e77a087cf8b9533ed7eb0b89eaed9bde06 /source3/client | |
| parent | d7fb3bb5721f3903fd985d2121f893a42761fc07 (diff) | |
| download | samba-4fb0e65a857f601562da72c6d6087d86ba3196a0.tar.gz | |
s3:popt_common: let POPT_COMMON_CREDENTIALS imply logfile and conffile loading
All users of POPT_COMMON_CREDENTIALS basically need the same logic,
while some ignore a broken smb.conf and some complain about it.
This will allow the future usage of config options in the
credential post processing.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 82521288be9..cde9776db9a 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -5765,6 +5765,7 @@ int main(int argc,char *argv[]) lp_set_cmdline("log level", "1"); + popt_common_credentials_set_ignore_missing_conf(); popt_common_credentials_set_delay_post(); /* skip argv(0) */ @@ -5901,16 +5902,6 @@ int main(int argc,char *argv[]) poptGetArg(pc)); } - if ( override_logfile ) - setup_logging( lp_logfile(talloc_tos()), DEBUG_FILE ); - - if (!lp_load_client(get_dyn_CONFIGFILE())) { - fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n", - argv[0], get_dyn_CONFIGFILE()); - } - - load_interfaces(); - if (service_opt && service) { size_t len; |