svn commit: samba r9942 - in branches/SAMBA_4_0/source/rpc_server/drsuapi: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-09-02 03:27:13 +0000 (Fri, 02 Sep 2005)
New Revision: 9942

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

Log:
CN=Configuration is always under the database-wide base dn, so don't
try and pass it down as a parameter.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/rpc_server/drsuapi/drsuapi_cracknames.c


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/drsuapi/drsuapi_cracknames.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/drsuapi/drsuapi_cracknames.c	2005-09-02 03:19:27 UTC (rev 9941)
+++ branches/SAMBA_4_0/source/rpc_server/drsuapi/drsuapi_cracknames.c	2005-09-02 03:27:13 UTC (rev 9942)
@@ -43,7 +43,6 @@
 
 static enum drsuapi_DsNameStatus LDB_lookup_spn_alias(krb5_context context, struct ldb_context *ldb_ctx, 
 				   TALLOC_CTX *mem_ctx,
-				   const struct ldb_dn *base_dn,
 				   const char *alias_from,
 				   char **alias_to)
 {
@@ -51,7 +50,7 @@
 	int count;
 	struct ldb_message **msg;
 	struct ldb_message_element *spnmappings;
-	struct ldb_dn *service_dn = ldb_dn_string_compose(mem_ctx, base_dn,
+	struct ldb_dn *service_dn = ldb_dn_string_compose(mem_ctx, samdb_base_dn(mem_ctx),
 						"CN=Directory Service,CN=Windows NT"
 						",CN=Services,CN=Configuration");
 	char *service_dn_str = ldb_dn_linearize(mem_ctx, service_dn);
@@ -117,7 +116,6 @@
 static WERROR DsCrackNameSPNAlias(struct drsuapi_bind_state *b_state, TALLOC_CTX *mem_ctx,
 				  struct smb_krb5_context *smb_krb5_context,
 				  uint32_t format_flags, uint32_t format_offered, uint32_t format_desired,
-				  const struct ldb_dn *result_basedn,
 				  const char *name, struct drsuapi_DsNameInfo1 *info1)
 {
 	WERROR wret;
@@ -149,7 +147,6 @@
 	/* MAP it */
 	namestatus = LDB_lookup_spn_alias(smb_krb5_context->krb5_context, 
 					  b_state->sam_ctx, mem_ctx, 
-					  result_basedn, 
 					  service, &new_service);
 	
 	if (namestatus != DRSUAPI_DS_NAME_STATUS_OK) {
@@ -530,7 +527,7 @@
 			return DsCrackNameSPNAlias(b_state, mem_ctx, 
 						   smb_krb5_context, 
 						   format_flags, format_offered, format_desired,
-						   result_basedn, name, info1);
+						   name, info1);
 			
 		case DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL:
 			return DsCrackNameUPN(b_state, mem_ctx, smb_krb5_context,