diff options
| -rw-r--r-- | source4/configure.ac | 2 | ||||
| -rw-r--r-- | source4/lib/events/events.h | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_wrap.c | 2 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/python/ldap.py | 8 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/samba3.py | 4 | ||||
| -rwxr-xr-x | source4/setup/provision | 4 | ||||
| -rwxr-xr-x | source4/setup/provision-backend | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index 7162081bbb..b2c169c86a 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -61,7 +61,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.3, SMB_INCLUDE_MK(../lib/tdb/python.mk) -SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1, +SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1, [ SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk) SMB_INCLUDE_MK(lib/ldb/tools/config.mk) diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h index d2e81f5279..9c6e8252e1 100644 --- a/source4/lib/events/events.h +++ b/source4/lib/events/events.h @@ -1 +1 @@ -#include <tevent.h> +#include <../lib/tevent/tevent.h> diff --git a/source4/lib/ldb/ldb_wrap.c b/source4/lib/ldb/ldb_wrap.c index e290b851f3..2055695020 100644 --- a/source4/lib/ldb/ldb_wrap.c +++ b/source4/lib/ldb/ldb_wrap.c @@ -3067,6 +3067,8 @@ static void py_ldb_debug(void *context, enum ldb_debug_level level, const char * if (ldif == NULL) { return Py_None; } else { + /* We don't want this attached to the 'ldb' any more */ + talloc_steal(NULL, ldif); return Py_BuildValue((char *)"(iO)", ldif->changetype, SWIG_NewPointerObj(ldif->msg, SWIGTYPE_p_ldb_message, 0)); } diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py index c64d85a0e5..821bd04b5c 100755 --- a/source4/lib/ldb/tests/python/ldap.py +++ b/source4/lib/ldb/tests/python/ldap.py @@ -13,10 +13,10 @@ sys.path.append("../lib/subunit/python") import samba.getopt as options from samba.auth import system_session -from ldb import (SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, - LDB_ERR_NO_SUCH_OBJECT, LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS, - LDB_ERR_ENTRY_ALREADY_EXISTS, LDB_ERR_UNWILLING_TO_PERFORM, - LDB_ERR_NOT_ALLOWED_ON_NON_LEAF, LDB_ERR_OTHER, LDB_ERR_INVALID_DN_SYNTAX) +from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError +from ldb import LDB_ERR_NO_SUCH_OBJECT, LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS +from ldb import LDB_ERR_ENTRY_ALREADY_EXISTS, LDB_ERR_UNWILLING_TO_PERFORM +from ldb import LDB_ERR_NOT_ALLOWED_ON_NON_LEAF, LDB_ERR_OTHER, LDB_ERR_INVALID_DN_SYNTAX from samba import Ldb from subunit import SubunitTestRunner from samba import param diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py index 1755cbdcf0..95a9fc2b56 100644 --- a/source4/scripting/python/samba/tests/samba3.py +++ b/source4/scripting/python/samba/tests/samba3.py @@ -18,8 +18,8 @@ # import unittest -from samba.samba3 import (GroupMappingDatabase, Registry, PolicyDatabase, SecretsDatabase, TdbSam, - WinsDatabase, SmbpasswdFile, ACB_NORMAL, IdmapDatabase, SAMUser) +from samba.samba3 import GroupMappingDatabase, Registry, PolicyDatabase, SecretsDatabase, TdbSam +from samba.samba3 import WinsDatabase, SmbpasswdFile, ACB_NORMAL, IdmapDatabase, SAMUser import os DATADIR=os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3") diff --git a/source4/setup/provision b/source4/setup/provision index bf6898faa8..4b48bab676 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -35,9 +35,7 @@ from samba.credentials import DONT_USE_KERBEROS from samba.auth import system_session import samba.getopt as options from samba import param -from samba.provision import (provision, - FILL_FULL, FILL_NT4SYNC, - FILL_DRS) +from samba.provision import provision, FILL_FULL, FILL_NT4SYNC, FILL_DRS # how do we make this case insensitive?? diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend index 0943da29b6..7d20ef5202 100755 --- a/source4/setup/provision-backend +++ b/source4/setup/provision-backend @@ -34,7 +34,7 @@ from samba import param from samba.auth import system_session import samba.getopt as options -from samba.provision import (provision_backend) +from samba.provision import provision_backend parser = optparse.OptionParser("provision [options]") sambaopts = options.SambaOptions(parser) |