svn commit: samba r20352 - in branches/SAMBA_4_0/source/auth: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-12-27 01:59:33 +0000 (Wed, 27 Dec 2006)
New Revision: 20352

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

Log:
Use the common function to find the DN for a domain.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/auth_sam.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/auth_sam.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_sam.c	2006-12-27 00:36:03 UTC (rev 20351)
+++ branches/SAMBA_4_0/source/auth/auth_sam.c	2006-12-27 01:59:33 UTC (rev 20352)
@@ -55,11 +55,10 @@
 	struct ldb_dn *domain_dn = NULL;
 
 	if (domain_name) {
-		char *escaped_domain = ldb_binary_encode_string(mem_ctx, domain_name);
+		domain_dn = samdb_domain_to_dn(sam_ctx, mem_ctx, domain_name);
+
 		/* find the domain's DN */
-		ret_domain = gendb_search(sam_ctx, mem_ctx, partitions_basedn, &msgs_domain_ref, domain_ref_attrs,
-					  "(&(&(|(&(dnsRoot=%s)(nETBIOSName=*))(nETBIOSName=%s))(objectclass=crossRef))(ncName=*))", 
-					  escaped_domain, escaped_domain);
+		ret_domain = gendb_search_dn(sam_ctx, mem_ctx, domain_dn, &msgs_domain_ref, domain_ref_attrs);
 		if (ret_domain == -1) {
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
@@ -75,8 +74,6 @@
 				 ret_domain, domain_name));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
-
-		domain_dn = samdb_result_dn(sam_ctx, mem_ctx, msgs_domain_ref[0], "nCName", NULL);
 	}
 
 	/* pull the user attributes */