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

s3:auth: remove lp_auth_methods() handling

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2017-06-19 10:55:35 +02:00 committed by Andrew Bartlett
parent 2c720b20ab
commit 584ef261c9
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source3/auth/auth.c
View File

@ -504,26 +504,13 @@ NTSTATUS make_auth3_context_for_ntlm(TALLOC_CTX *mem_ctx,
struct auth_context **auth_context)
{
const char *methods = NULL;
NTSTATUS nt_status;
switch (lp_server_role()) {
case ROLE_ACTIVE_DIRECTORY_DC:
DEBUG(5,("Making default auth method list for server role = "
"'active directory domain controller'\n"));
return make_auth_context_specific(mem_ctx, auth_context, "samba4");
default:
methods = "samba4";
break;
}
if (lp_auth_methods()) {
DEBUG(5,("Using specified auth order\n"));
nt_status = make_auth_context_text_list(
mem_ctx, auth_context,
discard_const_p(char *, lp_auth_methods()));
return nt_status;
}
switch (lp_server_role()) {
case ROLE_DOMAIN_MEMBER:
DEBUG(5,("Making default auth method list for server role = 'domain member'\n"));
methods = "guest sam winbind sam_ignoredomain";
@ -554,22 +541,6 @@ NTSTATUS make_auth3_context_for_netlogon(TALLOC_CTX *mem_ctx,
struct auth_context **auth_context)
{
const char *methods = NULL;
NTSTATUS nt_status;
/*
* We do the lp_auth_methods check before
* the lp_server_role check in order to
* backward compatible. The "auth methods" option
* is deprecated now, so this will go away in a future
* release.
*/
if (lp_auth_methods()) {
DBG_INFO("Using specified auth order for netlogon\n");
nt_status = make_auth_context_text_list(
mem_ctx, auth_context,
discard_const_p(char *, lp_auth_methods()));
return nt_status;
}
switch (lp_server_role()) {
case ROLE_DOMAIN_BDC: