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/ui.c | |
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/ui.c')
-rw-r--r-- | source4/torture/ui.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/ui.c b/source4/torture/ui.c index a7025aac95..efa584ebea 100644 --- a/source4/torture/ui.c +++ b/source4/torture/ui.c @@ -27,14 +27,14 @@ #include "auth/credentials/credentials.h" #include "lib/cmdline/popt_common.h" -struct torture_context *torture_context_init(TALLOC_CTX *mem_ctx, +struct torture_context *torture_context_init(struct event_context *event_ctx, const struct torture_ui_ops *ui_ops) { - struct torture_context *torture = talloc_zero(mem_ctx, + struct torture_context *torture = talloc_zero(event_ctx, struct torture_context); torture->ui_ops = ui_ops; torture->returncode = true; - torture->ev = cli_credentials_get_event_context(cmdline_credentials); + torture->ev = event_ctx; if (ui_ops->init) ui_ops->init(torture); |