Remove unused define.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:47:12 +0000 (20:47 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:47:12 +0000 (20:47 +0100)
source/scripting/python/config.m4
source/torture/libnet/libnet_BecomeDC.c

index 1f03ec8e345f09546d2a55f9ccc69725d7b2fef9..908efd1588e880a77860328b33a28ee6df749cb2 100644 (file)
@@ -66,7 +66,6 @@ if test $working_python = yes; then
        SMB_ENABLE(EXT_LIB_PYTHON,YES)
        SMB_ENABLE(smbpython,YES)
        SMB_ENABLE(LIBPYTHON,YES)
        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
        AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
        AC_MSG_RESULT([yes])
 else
        AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
index 0ef6a03a6a6c16e6ae23ab37d75297b73885adda..0dd06bda4cb771eb533264ae4ee04df83932fbd1 100644 (file)
@@ -275,7 +275,6 @@ static NTSTATUS test_become_dc_prepare_db_ejs(void *private_data,
        return NT_STATUS_OK;
 }
 
        return NT_STATUS_OK;
 }
 
-#ifdef HAVE_WORKING_PYTHON
 #include "param/param.h"
 #include <Python.h>
 #include "scripting/python/modules.h"
 #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;
 }
 
        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)
 
 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.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;
        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;