svn commit: samba r9064 - in branches/SOC/SAMBA_4_0: .
source/torture/rpc
brad at samba.org
brad at samba.org
Thu Aug 4 16:53:51 GMT 2005
Author: brad
Date: 2005-08-04 16:53:51 +0000 (Thu, 04 Aug 2005)
New Revision: 9064
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9064
Log:
r5253 at buttercup: j0j0 | 2005-08-04 10:53:00 -0600
Fixed a bug (passing a TALLOC_CTX to libnet_context_init() )
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:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5250
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
+ 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:9033
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5253
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5244
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===================================================================
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:49:17 UTC (rev 9063)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-08-04 16:53:51 UTC (rev 9064)
@@ -45,7 +45,6 @@
struct ldb_context *ldb_ctx;
struct ldb_message *ldb_msg;
struct libnet_context *libnet_ctx;
- struct libnet_Join *libnet_r;
const char *ldap_url;
const char *domain_dn;
@@ -80,7 +79,8 @@
struct drsuapi_DsBindInfoCtr *our_bind_info;
const char *binding = lp_parm_string(-1, "torture", "binding");
const char *new_dc_pass;
-
+ struct event_context *event_ctx = NULL;
+
ctx = talloc_zero(mem_ctx, struct DsSyncTest);
if (!ctx) return NULL;
@@ -126,7 +126,10 @@
/* ctx->old_dc ...*/
ctx->ldb_ctx = ldb_init(mem_ctx);
- ctx->libnet_ctx = libnet_context_init(mem_ctx);
+ /*libnet_context_init should be passed an event_context *ev,
+ not a TALLOC_CTX *mem_ctx.
+ */
+ ctx->libnet_ctx = libnet_context_init(event_ctx);
return ctx;
}
@@ -808,10 +811,6 @@
mem_ctx = talloc_init("torture_rpc_dssync");
ctx = test_create_context(mem_ctx);
- /*
- ctx->ldb_ctx = ldb_init(mem_ctx);
- ctx->libnet_ctx = libnet_context_init(mem_ctx);
- */
rtn = ldb_connect(ctx->ldb_ctx,ctx->ldap_url,0,NULL);
printf("Connected to %s.\n",ctx->ldap_url);
More information about the samba-cvs
mailing list