Fix merge errors on C provision interface after jelmer's good work.

[kamenim/samba.git] / source4 / torture / local / torture.c

diff --git a/source4/torture/local/torture.c b/source4/torture/local/torture.c
index 17d83456d590672e32726c78c7fecc881864309a..b48b191be65062a6b813a7c145bf78471a87a59b 100644 (file)
--- a/source4/torture/local/torture.c
+++ b/source4/torture/local/torture.c
@@ -43,7 +43,7 @@ static bool test_tempdir(struct torture_context *tctx)
 static bool test_provision(struct torture_context *tctx)
 {
        NTSTATUS status;
-       struct provision_settings *settings = talloc(tctx, struct provision_settings);
+       struct provision_settings *settings = talloc_zero(tctx, struct provision_settings);
        struct provision_result result;
        char *targetdir = NULL;
 
@@ -51,7 +51,6 @@ static bool test_provision(struct torture_context *tctx)
                                   "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";
@@ -61,6 +60,7 @@ static bool test_provision(struct torture_context *tctx)
        settings->netbios_name = "FOO";
        settings->realm = "EXAMPLE.COM";
        settings->domain = "EXAMPLE";
+       settings->netbios_name = "torture";
        settings->ntds_guid = NULL;
        settings->ntds_dn_str = NULL;
        settings->machine_password = "geheim";