diff options
| -rw-r--r-- | source4/param/config.mk | 4 | ||||
| -rw-r--r-- | source4/param/provision.c (renamed from source4/torture/util_provision.c) | 3 | ||||
| -rw-r--r-- | source4/param/provision.h | 45 | ||||
| -rw-r--r-- | source4/torture/config.mk | 4 | ||||
| -rw-r--r-- | source4/torture/libnet/libnet_BecomeDC.c | 1 | ||||
| -rw-r--r-- | source4/torture/local/torture.c | 1 | ||||
| -rw-r--r-- | source4/torture/util.h | 23 |
7 files changed, 54 insertions, 27 deletions
diff --git a/source4/param/config.mk b/source4/param/config.mk index eee22cf1b8..064c293fa4 100644 --- a/source4/param/config.mk +++ b/source4/param/config.mk @@ -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] diff --git a/source4/torture/util_provision.c b/source4/param/provision.c index 3167a37cdf..5d1f01c59a 100644 --- a/source4/torture/util_provision.c +++ b/source4/param/provision.c @@ -20,12 +20,11 @@ #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/source4/param/provision.h b/source4/param/provision.h new file mode 100644 index 0000000000..323159d417 --- /dev/null +++ b/source4/param/provision.h @@ -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_ */ 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 */ |