diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 13:32:38 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 13:32:38 +0200 |
| commit | dcc44f1757e24e169ca7730a5c56a0488cd5b110 (patch) | |
| tree | 8192a866e717df5a2788cb65bc11682b319cc9dc /source4/torture/local | |
| parent | 8dd6f735bc6ff65a364ac65572529e8abf6f130a (diff) | |
| parent | 0e59c73fe3a5cde76881294f17bf6ca9258f67a1 (diff) | |
| download | samba-dcc44f1757e24e169ca7730a5c56a0488cd5b110.tar.gz samba-dcc44f1757e24e169ca7730a5c56a0488cd5b110.tar.bz2 samba-dcc44f1757e24e169ca7730a5c56a0488cd5b110.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pidldocs
(This used to be commit c8dbf00b4490d804e1aac96a3fb66ff726bf9ef6)
Diffstat (limited to 'source4/torture/local')
| -rw-r--r-- | source4/torture/local/torture.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/source4/torture/local/torture.c b/source4/torture/local/torture.c index bb6e21ed4f..9bd60d9620 100644 --- a/source4/torture/local/torture.c +++ b/source4/torture/local/torture.c @@ -42,27 +42,28 @@ static bool test_tempdir(struct torture_context *tctx) static bool test_provision(struct torture_context *tctx) { NTSTATUS status; - struct provision_settings settings; - char *location = NULL; - torture_assert_ntstatus_ok(tctx, torture_temp_dir(tctx, "torture_provision", &location), + struct provision_settings *settings = talloc(tctx, struct provision_settings); + char *targetdir = NULL; + + torture_assert_ntstatus_ok(tctx, torture_temp_dir(tctx, "torture_provision", &targetdir), "torture_temp_dir should return NT_STATUS_OK" ); + settings->targetdir = talloc_steal(settings, targetdir); - settings.dns_name = "example.com"; - settings.site_name = "SOME-SITE-NAME"; - settings.root_dn_str = "DC=EXAMPLE,DC=COM"; - settings.domain_dn_str = "DC=EXAMPLE,DC=COM"; - settings.config_dn_str = NULL; - settings.schema_dn_str = NULL; - settings.invocation_id = NULL; - settings.netbios_name = "FOO"; - settings.realm = "EXAMPLE.COM"; - settings.domain = "EXAMPLE"; - settings.ntds_guid = NULL; - settings.ntds_dn_str = NULL; - settings.machine_password = "geheim"; - settings.targetdir = location; + settings->dns_name = "example.com"; + settings->site_name = "SOME-SITE-NAME"; + settings->root_dn_str = "DC=EXAMPLE,DC=COM"; + settings->domain_dn_str = "DC=EXAMPLE,DC=COM"; + settings->config_dn_str = NULL; + settings->schema_dn_str = NULL; + settings->invocation_id = NULL; + settings->netbios_name = "FOO"; + settings->realm = "EXAMPLE.COM"; + settings->domain = "EXAMPLE"; + settings->ntds_guid = NULL; + settings->ntds_dn_str = NULL; + settings->machine_password = "geheim"; - status = provision_bare(tctx, tctx->lp_ctx, &settings); + status = provision_bare(settings, tctx->lp_ctx, settings); torture_assert_ntstatus_ok(tctx, status, "provision"); |