Move provision C bindings to param/.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 9 Apr 2008 01:23:13 +0000 (03:23 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 9 Apr 2008 01:23:13 +0000 (03:23 +0200)
source/param/config.mk
source/param/provision.c [moved from source/torture/util_provision.c with 98% similarity]
source/param/provision.h [new file with mode: 0644]
source/torture/config.mk
source/torture/libnet/libnet_BecomeDC.c
source/torture/local/torture.c
source/torture/util.h

index eee22cf..064c293 100644 (file)
@@ -12,6 +12,10 @@ PRIVATE_PROTO_HEADER = proto.h
 
 PUBLIC_HEADERS += param/param.h
 
+[SUBSYSTEM::PROVISION]
+OBJ_FILES = provision.o
+PRIVATE_DEPENDENCIES = LIBPYTHON
+
 #################################
 # Start SUBSYSTEM share
 [SUBSYSTEM::share]
similarity index 98%
rename from source/torture/util_provision.c
rename to source/param/provision.c
index 3167a37..5d1f01c 100644 (file)
 #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 "param/provision.h"
 #include <Python.h>
 #include "scripting/python/modules.h"
 
diff --git a/source/param/provision.h b/source/param/provision.h
new file mode 100644 (file)
index 0000000..323159d
--- /dev/null
@@ -0,0 +1,45 @@
+/* 
+   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/>.
+*/
+
+#ifndef _PROVISION_H_
+#define _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);
+
+#endif /* _PROVISION_H_ */
index 1d09d74..7acb1e0 100644 (file)
@@ -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
 
 #################################
index f8699fe..bb5e8fe 100644 (file)
@@ -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;
index 9bd60d9..718bd38 100644 (file)
@@ -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)
 {
index 72f97e4..1009fcf 100644 (file)
 #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
 */