summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-10 16:05:58 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-15 09:18:33 +0200
commitb9a75d8438470065633c1ff69c653eaa799d5718 (patch)
tree4de126380880977dd912a6de018c01a1094f390d
parent5df459aed7f9f85a9eb15a16b1ad5a8bbdd1df5a (diff)
downloadsamba-b9a75d8438470065633c1ff69c653eaa799d5718.tar.gz
samba-b9a75d8438470065633c1ff69c653eaa799d5718.tar.bz2
samba-b9a75d8438470065633c1ff69c653eaa799d5718.zip
s3-auth: Merge SEC_DOMAIN and SEC_ADS cases in creating the default auth module list
-rw-r--r--source3/auth/auth.c9
1 files 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;