sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

NET-BECOME-DC: always try to build ejs and python code

Browse Source 
We let getenv("PROVISION_PYTHON") decide what we want
at runtime.

metze
This commit is contained in:
Stefan Metzmacher 2008-01-25 15:45:18 +01:00
parent d64a2288a2
commit acb5661f61
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/torture/libnet/libnet_BecomeDC.c
View File

@ -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,7 +147,7 @@ failed:
return ejs_error;
}
static NTSTATUS test_become_dc_prepare_db(void *private_data,
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);
@ -156,6 +155,8 @@ static NTSTATUS test_become_dc_prepare_db(void *private_data,
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,
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;