diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 17:41:50 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:34 +0100 |
| commit | ecea5ce24553989103d4a06296b24f4d29f30a36 (patch) | |
| tree | 806e6d582a799f24061dc5ca9df2ac36c26ad4f6 /source4/torture | |
| parent | ab5bbd26029e8ae62256c454daee14852b940a6a (diff) | |
| download | samba-ecea5ce24553989103d4a06296b24f4d29f30a36.tar.gz samba-ecea5ce24553989103d4a06296b24f4d29f30a36.tar.bz2 samba-ecea5ce24553989103d4a06296b24f4d29f30a36.zip | |
r26260: Store loadparm context in gensec context.
(This used to be commit b9e3a4862e267be39d603fed8207a237c3d72081)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/auth/ntlmssp.c | 4 | ||||
| -rw-r--r-- | source4/torture/masktest.c | 2 | ||||
| -rw-r--r-- | source4/torture/smbtorture.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c index 23269a0160..f2cc0a9182 100644 --- a/source4/torture/auth/ntlmssp.c +++ b/source4/torture/auth/ntlmssp.c @@ -32,7 +32,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx) TALLOC_CTX *mem_ctx = tctx; torture_assert_ntstatus_ok(tctx, - gensec_client_start(mem_ctx, &gensec_security, NULL), + gensec_client_start(mem_ctx, &gensec_security, NULL, tctx->lp_ctx), "gensec client start"); gensec_set_credentials(gensec_security, cmdline_credentials); @@ -86,7 +86,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx) talloc_free(gensec_security); torture_assert_ntstatus_ok(tctx, - gensec_client_start(mem_ctx, &gensec_security, NULL), + gensec_client_start(mem_ctx, &gensec_security, NULL, tctx->lp_ctx), "Failed to start GENSEC for NTLMSSP"); gensec_set_credentials(gensec_security, cmdline_credentials); diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index d9ac271119..9f47a6839f 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -309,7 +309,7 @@ static void usage(void) seed = time(NULL); - init_iconv(); + close_iconv(); while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vEl:")) != EOF) { switch (opt) { diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 75260e1277..ef6484ebc9 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -50,7 +50,7 @@ static bool run_matching(struct torture_context *torture, for (o = torture_root->children; o; o = o->next) { if (gen_fnmatch(expr, o->name) == 0) { *matched = true; - init_iconv(); + close_iconv(); ret &= torture_run_suite(torture, o); continue; } @@ -67,7 +67,7 @@ static bool run_matching(struct torture_context *torture, if (gen_fnmatch(expr, name) == 0) { *matched = true; - init_iconv(); + close_iconv(); torture->active_testname = talloc_strdup(torture, prefix); ret &= torture_run_suite(torture, c); free(name); @@ -83,7 +83,7 @@ static bool run_matching(struct torture_context *torture, asprintf(&name, "%s-%s", prefix, t->name); if (gen_fnmatch(expr, name) == 0) { *matched = true; - init_iconv(); + close_iconv(); torture->active_testname = talloc_strdup(torture, prefix); ret &= torture_run_tcase(torture, t); talloc_free(torture->active_testname); |