From 584ef261c9cefbef35caae58b978bfd9e31d7e1b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 19 Jun 2017 10:55:35 +0200 Subject: [PATCH] s3:auth: remove lp_auth_methods() handling Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- source3/auth/auth.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/source3/auth/auth.c b/source3/auth/auth.c index 3890cbcf024..4df74f9f39f 100644 --- a/source3/auth/auth.c +++ b/source3/auth/auth.c @@ -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: -- 2.47.3