s3-auth: Merge SEC_DOMAIN and SEC_ADS cases in creating the default auth module list

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index c442a536d8b509e56120b7ec41add361c7a11aec..4fc54bed37e194af37158732d7f0bfbe68426992 100644 (file)
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -489,7 +489,8 @@ NTSTATUS make_auth_context_subsystem(TALLOC_CTX *mem_ctx,
                switch (lp_security()) 
                {
                case SEC_DOMAIN:
                switch (lp_security()) 
                {
                case SEC_DOMAIN:

-                       DEBUG(5,("Making default auth method list for security=domain\n"));
+               case SEC_ADS:
+                       DEBUG(5,("Making default auth method list for security=domain and security=ads\n"));

                        auth_method_list = str_list_make_v3(
                                talloc_tos(), "guest sam winbind:ntdomain",
                                NULL);
                        auth_method_list = str_list_make_v3(
                                talloc_tos(), "guest sam winbind:ntdomain",
                                NULL);


@@ -514,12 +515,6 @@ NTSTATUS make_auth_context_subsystem(TALLOC_CTX *mem_ctx,
                                        talloc_tos(), "guest unix", NULL);
                        }
                        break;
                                        talloc_tos(), "guest unix", NULL);
                        }
                        break;

-               case SEC_ADS:
-                       DEBUG(5,("Making default auth method list for security=ADS\n"));
-                       auth_method_list = str_list_make_v3(
-                               talloc_tos(), "guest sam winbind:ntdomain",
-                               NULL);
-                       break;

                default:
                        DEBUG(5,("Unknown auth method!\n"));
                        return NT_STATUS_UNSUCCESSFUL;
                default:
                        DEBUG(5,("Unknown auth method!\n"));
                        return NT_STATUS_UNSUCCESSFUL;