From b9a75d8438470065633c1ff69c653eaa799d5718 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 10 Jun 2012 16:05:58 +1000 Subject: s3-auth: Merge SEC_DOMAIN and SEC_ADS cases in creating the default auth module list --- source3/auth/auth.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/source3/auth/auth.c b/source3/auth/auth.c index c442a536d8..4fc54bed37 100644 --- 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: - 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); @@ -514,12 +515,6 @@ NTSTATUS make_auth_context_subsystem(TALLOC_CTX *mem_ctx, 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; -- cgit