summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-05-15 03:24:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:44 -0500
commitae0cf9c240b7026fdcd94bbcfaeefdf66fc1bfbc (patch)
tree31d08d66fcf55bdcf8c7d58b929daa866b903ee2 /source4
parentc0c1b26a76ba436f1169f88cefdcf54b8c3d8ece (diff)
downloadsamba-ae0cf9c240b7026fdcd94bbcfaeefdf66fc1bfbc.tar.gz
samba-ae0cf9c240b7026fdcd94bbcfaeefdf66fc1bfbc.tar.bz2
samba-ae0cf9c240b7026fdcd94bbcfaeefdf66fc1bfbc.zip
r6793: Move auth_sam to use the dnsDomain rather than the
soon-to-be-depricated 'realm'. Add torture test for this behaviour. Andrew Bartlet (This used to be commit 6b9020661a13fd5ec6c5d1e21344d9f654978987)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/auth_sam.c2
-rw-r--r--source4/torture/rpc/samlogon.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 1e6c865361..947de1ef8c 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -215,7 +215,7 @@ static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, void *sam_ctx,
if (domain_name) {
/* find the domain's DN */
ret_domain = gendb_search(sam_ctx, mem_ctx, NULL, &msgs_domain, domain_attrs,
- "(&(|(realm=%s)(flatname=%s))(objectclass=domain))",
+ "(|(&(dnsDomain=%s)(objectClass=domainDNS))(&(flatname=%s)(objectclass=domain)))",
domain_name, domain_name);
if (ret_domain == -1) {
return NT_STATUS_INTERNAL_DB_CORRUPTION;
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 9a9c3039d2..104583058a 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -1260,6 +1260,12 @@ BOOL torture_rpc_samlogon(void)
True
},
{
+ cli_credentials_get_realm(cmdline_credentials),
+ cli_credentials_get_username(cmdline_credentials),
+ cli_credentials_get_password(cmdline_credentials),
+ True
+ },
+ {
NULL,
talloc_asprintf(mem_ctx,
"%s@%s",