[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-581-gacb5661

[Stefan Metzmacher]

The branch, v4-0-test has been updated
       via  acb5661f61ad62c02b5ec83d0f1f0c969f356c9f (commit)
       via  d64a2288a2cb3a8f74a18b740b265a460773635d (commit)
       via  351c2e99ab8b6a91f7355077b2d2944fd820839c (commit)
      from  1e042908992cdf3149ffc24472c7f0b1c3f9edef (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit acb5661f61ad62c02b5ec83d0f1f0c969f356c9f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 25 15:45:18 2008 +0100

    NET-BECOME-DC: always try to build ejs and python code
    
    We let getenv("PROVISION_PYTHON") decide what we want
    at runtime.
    
    metze

commit d64a2288a2cb3a8f74a18b740b265a460773635d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 25 15:41:51 2008 +0100

    torture: the libnet torture test depend on python
    
    metze

commit 351c2e99ab8b6a91f7355077b2d2944fd820839c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 25 15:40:55 2008 +0100

    configure: define HAVE_WORKING_PYTHON
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/scripting/python/config.m4       |    1 +
 source/torture/config.mk                |    3 ++-
 source/torture/libnet/libnet_BecomeDC.c |   25 ++++++++++++++++---------
 3 files changed, 19 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/scripting/python/config.m4 b/source/scripting/python/config.m4
index 4f46f92..3acd732 100644
--- a/source/scripting/python/config.m4
+++ b/source/scripting/python/config.m4
@@ -66,6 +66,7 @@ if test $working_python = yes; then
 	SMB_ENABLE(EXT_LIB_PYTHON,YES)
 	SMB_ENABLE(smbpython,YES)
 	SMB_ENABLE(LIBPYTHON,YES)
+	AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
 	AC_MSG_RESULT([yes])
 else
 	SMB_ENABLE(EXT_LIB_PYTHON,NO)
diff --git a/source/torture/config.mk b/source/torture/config.mk
index 0ee7873..ac3216c 100644
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -297,7 +297,8 @@ PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-NET \
 		smbcalls \
 		POPT_CREDENTIALS \
-		torture_rpc
+		torture_rpc \
+		LIBPYTHON
 # End SUBSYSTEM TORTURE_NET
 #################################
 
diff --git a/source/torture/libnet/libnet_BecomeDC.c b/source/torture/libnet/libnet_BecomeDC.c
index d964535..0ef6a03 100644
--- a/source/torture/libnet/libnet_BecomeDC.c
+++ b/source/torture/libnet/libnet_BecomeDC.c
@@ -90,7 +90,6 @@ static NTSTATUS test_become_dc_check_options(void *private_data,
 	return NT_STATUS_OK;
 }
 
-#ifndef PROVISION_PYTHON
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/appweb/ejs/ejsInternal.h"
 #include "scripting/ejs/smbcalls.h"
@@ -148,14 +147,16 @@ failed:
 	return ejs_error;
 }
 
-static NTSTATUS test_become_dc_prepare_db(void *private_data,
-					  const struct libnet_BecomeDC_PrepareDB *p)
+static NTSTATUS test_become_dc_prepare_db_ejs(void *private_data,
+					      const struct libnet_BecomeDC_PrepareDB *p)
 {
 	struct test_become_dc_state *s = talloc_get_type(private_data, struct test_become_dc_state);
 	char *ejs;
 	int ret;
 	bool ok;
 
+	DEBUG(0,("Provision for Become-DC test using EJS\n"));
+
 	DEBUG(0,("New Server[%s] in Site[%s]\n",
 		p->dest_dsa->dns_name, p->dest_dsa->site_name));
 
@@ -274,18 +275,20 @@ static NTSTATUS test_become_dc_prepare_db(void *private_data,
 	return NT_STATUS_OK;
 }
 
-#else 
+#ifdef HAVE_WORKING_PYTHON
 #include "param/param.h"
 #include <Python.h>
 #include "scripting/python/modules.h"
 
-static NTSTATUS test_become_dc_prepare_db(void *private_data,
-					  const struct libnet_BecomeDC_PrepareDB *p)
+static NTSTATUS test_become_dc_prepare_db_py(void *private_data,
+					     const struct libnet_BecomeDC_PrepareDB *p)
 {
 	struct test_become_dc_state *s = talloc_get_type(private_data, struct test_become_dc_state);
 	bool ok;
 	PyObject *provision_fn, *result, *parameters;
 
+	DEBUG(0,("Provision for Become-DC test using PYTHON\n"));
+
 	py_load_samba_modules();
 	Py_Initialize();
 
@@ -378,8 +381,7 @@ static NTSTATUS test_become_dc_prepare_db(void *private_data,
 
 	return NT_STATUS_OK;
 }
-
-#endif
+#endif /* HAVE_WORKING_PYTHON */
 
 static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
 				  const struct libnet_BecomeDC_StoreChunk *c)
@@ -876,7 +878,12 @@ bool torture_net_become_dc(struct torture_context *torture)
 
 	b.in.callbacks.private_data	= s;
 	b.in.callbacks.check_options	= test_become_dc_check_options;
-	b.in.callbacks.prepare_db	= test_become_dc_prepare_db;
+	b.in.callbacks.prepare_db	= test_become_dc_prepare_db_ejs;
+#ifdef HAVE_WORKING_PYTHON
+	if (getenv("PROVISION_PYTHON")) {
+		b.in.callbacks.prepare_db = test_become_dc_prepare_db_py;
+	}
+#endif
 	b.in.callbacks.schema_chunk	= test_become_dc_schema_chunk;
 	b.in.callbacks.config_chunk	= test_become_dc_store_chunk;
 	b.in.callbacks.domain_chunk	= test_become_dc_store_chunk;


-- 
Samba Shared Repository