Move provision C bindings to param/.

(This used to be commit 7d45ed0c3ebc57f7131603f768f8e022d7139530)

5 files changed, 4 insertions, 155 deletions

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 1d09d74f99..7acb1e0792 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -16,8 +16,8 @@ PUBLIC_DEPENDENCIES = \
 PUBLIC_HEADERS += torture/torture.h torture/ui.h
 
 [SUBSYSTEM::TORTURE_UTIL]
-OBJ_FILES = util_smb.o util_provision.o
-PRIVATE_DEPENDENCIES = LIBCLI_RAW LIBPYTHON smbcalls
+OBJ_FILES = util_smb.o
+PRIVATE_DEPENDENCIES = LIBCLI_RAW LIBPYTHON smbcalls PROVISION
 PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
 
 #################################
diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index f8699fe06a..bb5e8fe061 100644
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -38,6 +38,7 @@
 #include "auth/auth.h"
 #include "param/param.h"
 #include "torture/util.h"
+#include "param/provision.h"
 
 struct test_become_dc_state {
 	struct libnet_context *ctx;
diff --git a/source4/torture/local/torture.c b/source4/torture/local/torture.c
index 9bd60d9620..718bd38aad 100644
--- a/source4/torture/local/torture.c
+++ b/source4/torture/local/torture.c
@@ -25,6 +25,7 @@
 #include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
 #include "torture/util.h"
+#include "param/provision.h"
 
 static bool test_tempdir(struct torture_context *tctx)
 {
diff --git a/source4/torture/util.h b/source4/torture/util.h
index 72f97e4766..1009fcf9f1 100644
--- a/source4/torture/util.h
+++ b/source4/torture/util.h
@@ -20,29 +20,6 @@
 #ifndef _TORTURE_PROVISION_H_
 #define _TORTURE_PROVISION_H_
 
-struct provision_settings {
-	const char *dns_name;
-	const char *site_name;
-	const char *root_dn_str; 
-	const char *domain_dn_str;
-	const char *config_dn_str;
-	const char *schema_dn_str;
-	const char *server_dn_str;
-	const struct GUID *invocation_id;
-	const char *netbios_name;
-	const char *host_ip;
-	const char *realm;
-	const char *domain;
-	const struct GUID *ntds_guid;
-	const char *ntds_dn_str;
-	const char *machine_password;
-	const char *targetdir;
-};
-
-NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
-						struct provision_settings *settings);
-
-
 /**
   setup a directory ready for a test
 */
diff --git a/source4/torture/util_provision.c b/source4/torture/util_provision.c
deleted file mode 100644
index 3167a37cdf..0000000000
--- a/source4/torture/util_provision.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba utility functions
-   Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "auth/auth.h"
-#include "lib/ldb_wrap.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
-#include "torture/util.h"
-#include "librpc/ndr/libndr.h"
-
-#include "param/param.h"
-#include <Python.h>
-#include "scripting/python/modules.h"
-
-NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
-			struct provision_settings *settings)
-{
-	PyObject *provision_mod, *provision_dict, *provision_fn, *result, *parameters;
-	
-	DEBUG(0,("Provision for Become-DC test using python\n"));
-
-	py_load_samba_modules();
-	Py_Initialize();
-	py_update_path("bin"); /* FIXME: Can't assume this is always the case */
-
-	provision_mod = PyImport_Import(PyString_FromString("samba.provision"));
-
-	if (provision_mod == NULL) {
-		PyErr_Print();
-		DEBUG(0, ("Unable to import provision Python module.\n"));
-	      	return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	provision_dict = PyModule_GetDict(provision_mod);
-
-	if (provision_dict == NULL) {
-		DEBUG(0, ("Unable to get dictionary for provision module\n"));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	provision_fn = PyDict_GetItemString(provision_dict, "provision_become_dc");
-	if (provision_fn == NULL) {
-		PyErr_Print();
-		DEBUG(0, ("Unable to get provision_become_dc function\n"));
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-	
-	DEBUG(0,("New Server[%s] in Site[%s]\n", settings->dns_name, 
-			 settings->site_name));
-
-	DEBUG(0,("DSA Instance [%s]\n"
-		"\tobjectGUID[%s]\n"
-		"\tinvocationId[%s]\n",
-		settings->ntds_dn_str,
-		settings->ntds_guid == NULL?"None":GUID_string(mem_ctx, settings->ntds_guid),
-		settings->invocation_id == NULL?"None":GUID_string(mem_ctx, settings->invocation_id)));
-
-	DEBUG(0,("Pathes under targetdir[%s]\n",
-		 settings->targetdir));
-	parameters = PyDict_New();
-
-	PyDict_SetItemString(parameters, "rootdn", 
-						 PyString_FromString(settings->root_dn_str));
-	if (settings->targetdir != NULL)
-		PyDict_SetItemString(parameters, "targetdir", 
-							 PyString_FromString(settings->targetdir));
-	PyDict_SetItemString(parameters, "setup_dir", 
-			     PyString_FromString("setup"));
-	PyDict_SetItemString(parameters, "hostname", 
-						 PyString_FromString(settings->netbios_name));
-	PyDict_SetItemString(parameters, "domain", 
-						 PyString_FromString(settings->domain));
-	PyDict_SetItemString(parameters, "realm", 
-						 PyString_FromString(settings->realm));
-	if (settings->root_dn_str)
-		PyDict_SetItemString(parameters, "rootdn", 
-				     PyString_FromString(settings->root_dn_str));
-
-	if (settings->domain_dn_str) 
-		PyDict_SetItemString(parameters, "domaindn", 
-				     PyString_FromString(settings->domain_dn_str));
-
-	if (settings->schema_dn_str) 
-		PyDict_SetItemString(parameters, "schemadn", 
-				     PyString_FromString(settings->schema_dn_str));
-	
-	if (settings->config_dn_str) 
-		PyDict_SetItemString(parameters, "configdn", 
-				     PyString_FromString(settings->config_dn_str));
-	
-	if (settings->server_dn_str) 
-		PyDict_SetItemString(parameters, "serverdn", 
-				     PyString_FromString(settings->server_dn_str));
-	
-	if (settings->site_name) 
-		PyDict_SetItemString(parameters, "sitename", 
-				     PyString_FromString(settings->site_name));
-
-	PyDict_SetItemString(parameters, "machinepass", 
-			     PyString_FromString(settings->machine_password));
-
-	result = PyEval_CallObjectWithKeywords(provision_fn, NULL, parameters);
-
-	Py_DECREF(parameters);
-
-	if (result == NULL) {
-		PyErr_Print();
-		PyErr_Clear();
-		return NT_STATUS_UNSUCCESSFUL;
-	}
-
-	return NT_STATUS_OK;
-}