diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 13:26:59 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 13:26:59 +0100 |
| commit | a19534d2072ca7dc4c70767d02db58503678cfaa (patch) | |
| tree | 03541a126783dbdbabfdabebe7ae78c48bfe5075 /source4/torture | |
| parent | e0a5fb8a9be9f3002d6f73c272793a75fa71d313 (diff) | |
| parent | af007e5837ac472f0527505c8013b837932136bc (diff) | |
| download | samba-a19534d2072ca7dc4c70767d02db58503678cfaa.tar.gz samba-a19534d2072ca7dc4c70767d02db58503678cfaa.tar.bz2 samba-a19534d2072ca7dc4c70767d02db58503678cfaa.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit eff9c9cedd7410c3c089d090e3f83f8cc10f1831)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/libnet/libnet_BecomeDC.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c index 0ef6a03a6a..0dd06bda4c 100644 --- a/source4/torture/libnet/libnet_BecomeDC.c +++ b/source4/torture/libnet/libnet_BecomeDC.c @@ -275,7 +275,6 @@ static NTSTATUS test_become_dc_prepare_db_ejs(void *private_data, return NT_STATUS_OK; } -#ifdef HAVE_WORKING_PYTHON #include "param/param.h" #include <Python.h> #include "scripting/python/modules.h" @@ -381,7 +380,6 @@ static NTSTATUS test_become_dc_prepare_db_py(void *private_data, return NT_STATUS_OK; } -#endif /* HAVE_WORKING_PYTHON */ static NTSTATUS test_apply_schema(struct test_become_dc_state *s, const struct libnet_BecomeDC_StoreChunk *c) @@ -878,12 +876,10 @@ 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_ejs; -#ifdef HAVE_WORKING_PYTHON - if (getenv("PROVISION_PYTHON")) { - b.in.callbacks.prepare_db = test_become_dc_prepare_db_py; + b.in.callbacks.prepare_db = test_become_dc_prepare_db_py; + if (getenv("PROVISION_EJS")) { + b.in.callbacks.prepare_db = test_become_dc_prepare_db_ejs; } -#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; |