diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-14 19:32:42 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-14 19:32:42 +0200 |
| commit | 68a2c547d00d7a8d0c15744172489d9d010c31a3 (patch) | |
| tree | 54313b0dc50014015d680121fa750a5d4777c7a4 /source4/torture/rpc | |
| parent | 2cdfaedee203a726bddfb46fb10d9604de32a05f (diff) | |
| parent | 4f51b0246db3242ee02ee16905cba13a5dc5633a (diff) | |
| download | samba-68a2c547d00d7a8d0c15744172489d9d010c31a3.tar.gz samba-68a2c547d00d7a8d0c15744172489d9d010c31a3.tar.bz2 samba-68a2c547d00d7a8d0c15744172489d9d010c31a3.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 0f0c8519b87481e3473a469cefd51c76b4a7632e)
Diffstat (limited to 'source4/torture/rpc')
| -rw-r--r-- | source4/torture/rpc/dfs.c | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/testjoin.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c index 9cfdd80578..5656476922 100644 --- a/source4/torture/rpc/dfs.c +++ b/source4/torture/rpc/dfs.c @@ -56,7 +56,7 @@ static bool test_NetShareAdd(TALLOC_CTX *mem_ctx, printf("Creating share %s\n", sharename); - if (!(libnetctx = libnet_context_init(NULL, tctx->lp_ctx))) { + if (!(libnetctx = libnet_context_init(tctx->ev, tctx->lp_ctx))) { return false; } @@ -96,7 +96,7 @@ static bool test_NetShareDel(TALLOC_CTX *mem_ctx, printf("Deleting share %s\n", sharename); - if (!(libnetctx = libnet_context_init(NULL, tctx->lp_ctx))) { + if (!(libnetctx = libnet_context_init(tctx->ev, tctx->lp_ctx))) { return false; } diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c index 892886c08c..100e7cead2 100644 --- a/source4/torture/rpc/testjoin.c +++ b/source4/torture/rpc/testjoin.c @@ -311,7 +311,7 @@ _PUBLIC_ struct test_join *torture_join_domain(struct torture_context *tctx, struct samr_SetUserInfo s; union samr_UserInfo u; - tj = talloc(NULL, struct test_join); + tj = talloc(tctx, struct test_join); if (!tj) return NULL; libnet_r = talloc(tj, struct libnet_JoinDomain); @@ -320,7 +320,7 @@ _PUBLIC_ struct test_join *torture_join_domain(struct torture_context *tctx, return NULL; } - libnet_ctx = libnet_context_init(NULL, tctx->lp_ctx); + libnet_ctx = libnet_context_init(tctx->ev, tctx->lp_ctx); if (!libnet_ctx) { talloc_free(tj); return NULL; |