svn commit: samba r6793 - in branches/SAMBA_4_0/source: auth torture/rpc

[abartlet at samba.org]

Author: abartlet
Date: 2005-05-15 03:24:48 +0000 (Sun, 15 May 2005)
New Revision: 6793

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6793

Log:
Move auth_sam to use the dnsDomain rather than the
soon-to-be-depricated 'realm'.

Add torture test for this behaviour.

Andrew Bartlet

Modified:
   branches/SAMBA_4_0/source/auth/auth_sam.c
   branches/SAMBA_4_0/source/torture/rpc/samlogon.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/auth_sam.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_sam.c	2005-05-15 03:07:20 UTC (rev 6792)
+++ branches/SAMBA_4_0/source/auth/auth_sam.c	2005-05-15 03:24:48 UTC (rev 6793)
@@ -215,7 +215,7 @@
 	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;

Modified: branches/SAMBA_4_0/source/torture/rpc/samlogon.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samlogon.c	2005-05-15 03:07:20 UTC (rev 6792)
+++ branches/SAMBA_4_0/source/torture/rpc/samlogon.c	2005-05-15 03:24:48 UTC (rev 6793)
@@ -1260,6 +1260,12 @@
 			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",