s3:auth_winbind: remove fallback to optional backend

This is not possible anymore, as the trustdomain backend
was removed in commit 75c152c0d764165a4a9dd0a85390af063dd0192a.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13722
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13723

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
(cherry picked from commit f3bac8c91121871bf8ce852bc3e3ea2e834d3f27)

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index d13d0fe471c967d1f692c36b89dbff4d2fb7c231..0a96d591808bd14a4231c7ce2bb7c9a2e0316aeb 100644 (file)
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -557,7 +557,7 @@ NTSTATUS make_auth3_context_for_netlogon(TALLOC_CTX *mem_ctx,
        switch (lp_server_role()) {
        case ROLE_DOMAIN_BDC:
        case ROLE_DOMAIN_PDC:
-               methods = "sam_netlogon3 winbind:trustdomain";
+               methods = "sam_netlogon3 winbind";
                break;
 
        default:

diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index 6bf2118037dc350e31f940c585ca4bc2dcfb5083..10e6c53c108510da2e5ca38053d19eaf139b23ec 100644 (file)
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -110,12 +110,6 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
        }
 
        if (wbc_status == WBC_ERR_WINBIND_NOT_AVAILABLE) {
-               struct auth_methods *auth_method =
-                       (struct auth_methods *)my_private_data;
-
-               if ( auth_method )
-                       return auth_method->auth(auth_context, auth_method->private_data, 
-                               mem_ctx, user_info, server_info);
                return NT_STATUS_LOGON_FAILURE;
        }
 
@@ -164,16 +158,6 @@ static NTSTATUS auth_init_winbind(struct auth_context *auth_context, const char
        result->name = "winbind";
        result->auth = check_winbind_security;
 
-       if (param && *param) {
-               /* we load the 'fallback' module - if winbind isn't here, call this
-                  module */
-               auth_methods *priv;
-               if (!load_auth_module(auth_context, param, &priv)) {
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
-               result->private_data = (void *)priv;
-       }
-
        *auth_method = result;
        return NT_STATUS_OK;
 }