svn commit: samba r9405 - in branches/SOC/SAMBA_4_0: . source/torture/rpc

[brad at samba.org]

Author: brad
Date: 2005-08-19 20:50:10 +0000 (Fri, 19 Aug 2005)
New Revision: 9405

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

Log:
 r5500 at buttercup:  j0j0 | 2005-08-19 14:56:25 -0600
 Get dssync.c compiling again after merge (ldb_dn changes from rev. 9391).
 

Modified:
   branches/SOC/SAMBA_4_0/
   branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c


Changeset:

Property changes on: branches/SOC/SAMBA_4_0
___________________________________________________________________
Name: svk:merge
   - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9397
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5498
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5497
   + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9397
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5500
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5497

Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===================================================================
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c	2005-08-19 20:47:36 UTC (rev 9404)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c	2005-08-19 20:50:10 UTC (rev 9405)
@@ -164,6 +164,7 @@
 {
 	{
 		int rtn;
+		struct ldb_dn *tmp_ldb_dn;
 		
 		rtn = ldb_connect(ctx->ldb_ctx,ctx->ldap_url,0,NULL);
 		if (rtn != 0) {
@@ -182,7 +183,9 @@
 		This delete fails because we don't have a DsReplicaAdd to create the ntds_dn.
 		*/
 		printf("test_destroy_context(): deleting ntds_dn %s.\n",ctx->new_dc.dc_info2.ntds_dn);
-		rtn = ldb_delete(ctx->ldb_ctx,ctx->new_dc.dc_info2.ntds_dn);
+		
+		tmp_ldb_dn = ldb_dn_explode(ctx, ctx->new_dc.dc_info2.ntds_dn);
+		rtn = ldb_delete(ctx->ldb_ctx,tmp_ldb_dn);
 		if (rtn != 0) {
 			printf("test_destroy_context(): ldb_delete(ntds_dn) failed: %s.\n",
 				ldb_errstring(ctx->ldb_ctx));
@@ -195,16 +198,16 @@
 
 	{
 		int rtn;
-		
+		struct ldb_dn *tmp_ldb_dn;
 		/*
 		ldif = talloc_asprintf(ctx,
 			"dn: %s\n"
 			"changetype: delete\n",
 			ctx->new_dc.dc_info2.server_dn);
 		*/
-
+		tmp_ldb_dn = ldb_dn_explode(ctx, ctx->new_dc.dc_info2.server_dn);
 		printf("test_destroy_context(): deleting server_dn %s.\n",ctx->new_dc.dc_info2.server_dn);
-		rtn = ldb_delete(ctx->ldb_ctx,ctx->new_dc.dc_info2.server_dn);
+		rtn = ldb_delete(ctx->ldb_ctx,tmp_ldb_dn);
 		if (rtn != 0) {
 			printf("test_destroy_context(): ldb_delete(server_dn) failed: %s.\n",
 				ldb_errstring(ctx->ldb_ctx));
@@ -362,6 +365,7 @@
 	NTSTATUS status;
 	BOOL ret = True;
 	int rtn;
+	struct ldb_dn *tmp_ldb_dn;
 	
 	rtn = ldb_connect(ctx->ldb_ctx,ctx->ldap_url,0,NULL);
 	if (rtn != 0) {
@@ -408,7 +412,9 @@
 	ldb_msg_add_string(ctx->ldb_ctx,ctx->ldb_msg,"objectClass","server");
 	ldb_msg_add_string(ctx->ldb_ctx,ctx->ldb_msg,"systemFlags","50000000");
 	ldb_msg_add_string(ctx->ldb_ctx,ctx->ldb_msg,"serverReference",ctx->new_dc.dc_info2.computer_dn);
-	ctx->ldb_msg->dn = talloc_asprintf(mem_ctx,"%s",ctx->new_dc.dc_info2.server_dn);
+	tmp_ldb_dn = ldb_dn_explode(ctx, ctx->new_dc.dc_info2.server_dn);
+	ctx->ldb_msg->dn = tmp_ldb_dn;
+/*	ctx->ldb_msg->dn = talloc_asprintf(mem_ctx,"%s",ctx->new_dc.dc_info2.server_dn);*/
 	ctx->ldb_msg->elements->flags = LDB_FLAG_MOD_ADD;
 	
 	rtn = ldb_add(ctx->ldb_ctx,ctx->ldb_msg);
@@ -418,7 +424,7 @@
 		return False;
 	}
 	printf("ldb_add(server_dn) succeeded.\n");
-	ldb_msg_free(ctx->ldb_ctx,ctx->ldb_msg);
+	/*ldb_msg_free(ctx->ldb_ctx,ctx->ldb_msg);*/
 
 	/*
 	typedef [noprint] struct {