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/rpcclient | |
| 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/rpcclient')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 138fdba0b52..9faf01b0890 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -949,7 +949,6 @@ out_free: char *user, *domain, *q; const char *host; int signing_state = SMB_SIGNING_IPC_DEFAULT; - bool ok; /* make sure the vars that get altered (4th field) are in a fixed location or certain compilers complain */ @@ -1016,17 +1015,6 @@ out_free: popt_burn_cmdline_password(argc, argv); rpcclient_auth_info = cmdline_auth_info; - /* Load smb.conf file */ - - ok = lp_load_global(get_dyn_CONFIGFILE()); - if (!ok) { - fprintf(stderr, - "Can't load %s - run testparm to debug it\n", - get_dyn_CONFIGFILE()); - result = 1; - goto done; - } - nt_status = messaging_init_client(talloc_autofree_context(), samba_tevent_context_init(talloc_autofree_context()), &rpcclient_msg_ctx); @@ -1045,9 +1033,6 @@ out_free: goto done; } - /* We must load interfaces after we load the smb.conf */ - load_interfaces(); - if (!init_names()) { result = 1; goto done; |