summaryrefslogtreecommitdiff
path: root/source4/torture/local
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-04-11 11:11:42 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-04-11 11:11:42 +1000
commitae977ef24780c52da66e3608a3ed94649ae9f873 (patch)
tree51f1a491b9f515049bc6eb3dc2b3b8ae2a3743e6 /source4/torture/local
parent9198a519bea19a4d9f863fde5fb3aa23f60b5c88 (diff)
parent8ed6f6d5a825c8b0e8d66d30877a91a96fe6e7a4 (diff)
downloadsamba-ae977ef24780c52da66e3608a3ed94649ae9f873.tar.gz
samba-ae977ef24780c52da66e3608a3ed94649ae9f873.tar.bz2
samba-ae977ef24780c52da66e3608a3ed94649ae9f873.zip
Fix merge errors on C provision interface after jelmer's good work.
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet Conflicts: source/torture/local/torture.c (This used to be commit 5bf1c89cf8af08fbcf4f5089079920840daad7b8)
Diffstat (limited to 'source4/torture/local')
-rw-r--r--source4/torture/local/torture.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/torture/local/torture.c b/source4/torture/local/torture.c
index 83c531124d..b48b191be6 100644
--- a/source4/torture/local/torture.c
+++ b/source4/torture/local/torture.c
@@ -44,6 +44,7 @@ static bool test_provision(struct torture_context *tctx)
{
NTSTATUS status;
struct provision_settings *settings = talloc_zero(tctx, struct provision_settings);
+ struct provision_result result;
char *targetdir = NULL;
torture_assert_ntstatus_ok(tctx, torture_temp_dir(tctx, "torture_provision", &targetdir),
@@ -64,10 +65,13 @@ static bool test_provision(struct torture_context *tctx)
settings->ntds_dn_str = NULL;
settings->machine_password = "geheim";
- status = provision_bare(settings, tctx->lp_ctx, settings);
+ status = provision_bare(settings, tctx->lp_ctx, settings, &result);
torture_assert_ntstatus_ok(tctx, status, "provision");
+ torture_assert_str_equal(tctx, result.domaindn, "DC=EXAMPLE,DC=COM",
+ "domaindn incorrect");
+
return true;
}