diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-05-22 16:09:10 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-05-22 16:09:10 +1000 |
| commit | fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5 (patch) | |
| tree | 6e6b4079ecf50b42b862d0f8accc392e5f061cb8 /source4/lib/ldb | |
| parent | af82204f4355ac9011b61019bbbe40e7e3632d4c (diff) | |
| parent | 8172f3eb220575d40f9ab5129d36e4e0003dee56 (diff) | |
| download | samba-fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5.tar.gz samba-fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5.tar.bz2 samba-fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5.zip | |
Merge commit 'origin/v4-0-test' into v4-0-test
(This used to be commit d7f3348c891e14de0e1b195714468ff998400f60)
Diffstat (limited to 'source4/lib/ldb')
| -rw-r--r-- | source4/lib/ldb/python.mk | 6 | ||||
| -rwxr-xr-x | source4/lib/ldb/tests/python/ldap.py | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk index 448cc3ed60..89aba8f276 100644 --- a/source4/lib/ldb/python.mk +++ b/source4/lib/ldb/python.mk @@ -1,6 +1,10 @@ [PYTHON::swig_ldb] +LIBRARY_REALNAME = _ldb.$(SHLIBEXT) PUBLIC_DEPENDENCIES = LIBLDB CFLAGS = -Ilib/ldb/include -SWIG_FILE = ldb.i swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o + +$(eval $(call python_py_module_template,ldb.py,lib/ldb/ldb.py)) + +$(swig_ldb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py index 7cbe6e5e7d..c76222c207 100755 --- a/source4/lib/ldb/tests/python/ldap.py +++ b/source4/lib/ldb/tests/python/ldap.py @@ -10,14 +10,14 @@ sys.path.append("bin/python") import samba.getopt as options -from auth import system_session +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) from samba import Ldb from subunit import SubunitTestRunner -import param +from samba import param import unittest parser = optparse.OptionParser("ldap [options] <host>") |