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)

diff --cc source4/param/provision.c
Simple merge

diff --cc source4/param/provision.h
Simple merge

diff --cc source4/scripting/python/samba/provision.py
Simple merge

diff --cc source4/torture/libnet/libnet_BecomeDC.c
Simple merge

diff --cc source4/torture/local/torture.c
index 83c531124d22addd7147c12c74b94b04c2e09112,17d83456d590672e32726c78c7fecc881864309a..b48b191be65062a6b813a7c145bf78471a87a59b
--- 1/source4/torture/local/torture.c
--- 2/source4/torture/local/torture.c
+++ b/source4/torture/local/torture.c
@@@ -43,7 -43,8 +43,8 @@@ static bool test_tempdir(struct torture
  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;
  
        torture_assert_ntstatus_ok(tctx, torture_temp_dir(tctx, "torture_provision", &targetdir),