[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha3-80-g7d45ed0
Jelmer Vernooij
jelmer at samba.org
Wed Apr 9 01:43:35 GMT 2008
The branch, v4-0-test has been updated
via 7d45ed0c3ebc57f7131603f768f8e022d7139530 (commit)
from 9c18cf670889c9eb8c12b505c3b9ce5f9a516839 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 7d45ed0c3ebc57f7131603f768f8e022d7139530
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Apr 9 03:23:13 2008 +0200
Move provision C bindings to param/.
-----------------------------------------------------------------------
Summary of changes:
source/param/config.mk | 4 ++
.../util_provision.c => param/provision.c} | 3 +-
.../python/pyrpc.h => param/provision.h} | 37 +++++++++++++-------
source/torture/config.mk | 4 +-
source/torture/libnet/libnet_BecomeDC.c | 1 +
source/torture/local/torture.c | 1 +
source/torture/util.h | 23 ------------
7 files changed, 33 insertions(+), 40 deletions(-)
rename source/{torture/util_provision.c => param/provision.c} (98%)
copy source/{scripting/python/pyrpc.h => param/provision.h} (54%)
Changeset truncated at 500 lines:
diff --git a/source/param/config.mk b/source/param/config.mk
index eee22cf..064c293 100644
--- a/source/param/config.mk
+++ b/source/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/source/torture/util_provision.c b/source/param/provision.c
similarity index 98%
rename from source/torture/util_provision.c
rename to source/param/provision.c
index 3167a37..5d1f01c 100644
--- a/source/torture/util_provision.c
+++ b/source/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/source/scripting/python/pyrpc.h b/source/param/provision.h
similarity index 54%
copy from source/scripting/python/pyrpc.h
copy to source/param/provision.h
index f4d0f37..323159d 100644
--- a/source/scripting/python/pyrpc.h
+++ b/source/param/provision.h
@@ -17,18 +17,29 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#define PY_CHECK_TYPE(type, var, fail) \
- if (!type ## _Check(var)) {\
- PyErr_Format(PyExc_TypeError, "Expected type %s", type ## _Type.tp_name); \
- fail; \
- }
+#ifndef _PROVISION_H_
+#define _PROVISION_H_
-#define dom_sid2_Type dom_sid_Type
-#define dom_sid28_Type dom_sid_Type
-#define dom_sid2_Check dom_sid_Check
-#define dom_sid28_Check dom_sid_Check
+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;
+};
-/* This macro is only provided by Python >= 2.3 */
-#ifndef PyAPI_DATA
-# define PyAPI_DATA(RTYPE) extern RTYPE
-#endif
+NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
+ struct provision_settings *settings);
+
+#endif /* _PROVISION_H_ */
diff --git a/source/torture/config.mk b/source/torture/config.mk
index 1d09d74..7acb1e0 100644
--- a/source/torture/config.mk
+++ b/source/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/source/torture/libnet/libnet_BecomeDC.c b/source/torture/libnet/libnet_BecomeDC.c
index f8699fe..bb5e8fe 100644
--- a/source/torture/libnet/libnet_BecomeDC.c
+++ b/source/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/source/torture/local/torture.c b/source/torture/local/torture.c
index 9bd60d9..718bd38 100644
--- a/source/torture/local/torture.c
+++ b/source/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/source/torture/util.h b/source/torture/util.h
index 72f97e4..1009fcf 100644
--- a/source/torture/util.h
+++ b/source/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
*/
--
Samba Shared Repository
More information about the samba-cvs
mailing list