summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-21 23:59:34 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-21 23:59:34 +0200
commit49706ab19bd3ffd6125639e6a7753b2350cf54e1 (patch)
tree0b9493295e69ef8c85926a67b5413f83ee9cbee2 /source4/lib/ldb
parentb1fc7bab111fcef7f546e821f24c175bdec6865a (diff)
downloadsamba-49706ab19bd3ffd6125639e6a7753b2350cf54e1.tar.gz
samba-49706ab19bd3ffd6125639e6a7753b2350cf54e1.tar.bz2
samba-49706ab19bd3ffd6125639e6a7753b2350cf54e1.zip
Move more modules inside of the samba package.
(This used to be commit 9b39e99f48266a54ed0b8890c2efde218b4b118a)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/python.mk2
-rwxr-xr-xsource4/lib/ldb/tests/python/ldap.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 77af5d6183..7b430f4e2f 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -1,7 +1,7 @@
[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
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>")