s3:auth: remove lp_auth_methods() handling

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 3890cbcf024f1441c66a6d92eb9a078ce4e7a5bf..4df74f9f39fc38a328851c5aacd80c86b6ce68f5 100644 (file)
--- 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: