summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-16 15:33:58 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:50:34 +0100
commit1afe0549163bbc639ae1a030239c9ebcd1b922bf (patch)
tree967da56818175f109e818df9a1a72f1d1bdbf546
parenteb2c71912baceb1a6884ce143ae91f1e3d2a69fb (diff)
downloadsamba-1afe0549163bbc639ae1a030239c9ebcd1b922bf.tar.gz
samba-1afe0549163bbc639ae1a030239c9ebcd1b922bf.tar.bz2
samba-1afe0549163bbc639ae1a030239c9ebcd1b922bf.zip
r26474: Move credentials-specific kerberos file to credentials subsystem. Fixes missing symbols in some of the python bindings.
(This used to be commit e26d0fff6d40899113196ac35a86a9baa10cc9c2)
-rw-r--r--source4/auth/credentials/config.mk5
-rw-r--r--source4/auth/credentials/credentials_krb5.h1
-rw-r--r--source4/auth/kerberos/config.mk3
-rw-r--r--source4/samba4-skip4
-rw-r--r--source4/scripting/python/config.mk4
-rw-r--r--source4/scripting/python/samba/__init__.py9
-rwxr-xr-xsource4/selftest/samba4_tests.sh9
7 files changed, 20 insertions, 15 deletions
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index c8fb8c8628..1a6c1487b0 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -17,9 +17,10 @@ PRIVATE_DEPENDENCIES = CREDENTIALS_KRB5
[SUBSYSTEM::CREDENTIALS_KRB5]
PUBLIC_PROTO_HEADER = credentials_krb5_proto.h
PUBLIC_HEADERS = credentials_krb5.h
-OBJ_FILES = credentials_krb5.o
+OBJ_FILES = credentials_krb5.o \
+ ../kerberos/kerberos_util.o
PUBLIC_DEPENDENCIES = \
- HEIMDAL_GSSAPI
+ HEIMDAL_GSSAPI KERBEROS
# End SUBSYSTEM CREDENTIALS
#################################
diff --git a/source4/auth/credentials/credentials_krb5.h b/source4/auth/credentials/credentials_krb5.h
index 1026508601..bf6047edf3 100644
--- a/source4/auth/credentials/credentials_krb5.h
+++ b/source4/auth/credentials/credentials_krb5.h
@@ -21,6 +21,7 @@
*/
#include <gssapi/gssapi.h>
+#include <krb5.h>
struct ccache_container;
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index c3f8c6f8ce..7493a6d06d 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -5,11 +5,10 @@ PRIVATE_PROTO_HEADER = proto.h
OBJ_FILES = kerberos.o \
clikrb5.o \
kerberos_heimdal.o \
- kerberos_util.o \
kerberos_pac.o \
gssapi_parse.o \
krb5_init_context.o
PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE
-PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply CREDENTIALS_KRB5 LIBPACKET LIBNDR
+PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply LIBPACKET LIBNDR
# End SUBSYSTEM KERBEROS
#################################
diff --git a/source4/samba4-skip b/source4/samba4-skip
index 0e785b7002..f0efdfbfa6 100644
--- a/source4/samba4-skip
+++ b/source4/samba4-skip
@@ -49,6 +49,4 @@ RPC-FRSAPI # Not provided by Samba 4
^samba4.NET-API-BECOME-DC.*$ # Fails
WINBIND # FIXME: This should not be skipped
NSS-TEST # Fails
-samba4.credentials.python # Fails to link properly
-samba4.registry.python # Fails to link properly
-samba4.auth.python # Fails to link properly
+samba4.auth.python # Missing symbols
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 9d972f7ee0..cf17a28a70 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -25,3 +25,7 @@ PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py
pydoctor:: pythonmods
LD_LIBRARY_PATH=bin/shared PYTHONPATH=bin/python pydoctor --make-html --docformat=restructuredtext --add-package scripting/python/samba/ $(addprefix --add-module , $(PYDOCTOR_MODULES))
+
+clean::
+ @echo "Removing python modules"
+ @rm -f bin/python/*
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 00b82e1800..2c51440b0c 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -21,6 +21,15 @@
import os
from misc import ldb_set_credentials
+def _in_source_tree():
+ print os.path.exists("%s/../../../samba4-skip" % os.path.dirname(__file__))
+
+# When running, in-tree, make sure bin/python is in the PYTHONPATH
+if _in_source_tree():
+ import sys
+ dir = os.path.dirname(__file__)
+ sys.path.append("%s/../../../bin/python" % os.path.dirname(__file__))
+
def Ldb(url, session_info=None, credentials=None, modules_dir=None):
"""Open a Samba Ldb file.
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 424e1f0209..eaf7276485 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -212,7 +212,7 @@ if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
for f in $samba4srcdir/pidl/tests/*.pl; do
- plantest "pidl/`basename $f`" none $PERL $f "|" $samba4srcdir/script/harness2subunit.pl
+ plantest "pidl.`basename $f .pl`" none $PERL $f "|" $samba4srcdir/script/harness2subunit.pl
done
else
echo "Skipping pidl tests - Test::More not installed"
@@ -279,13 +279,6 @@ for env in dc member; do
done
done
-# Tests for SWIG
-# export PYTHONPATH=lib/tdb/swig:lib/ldb/swig:scripting/swig:$PYTHONPATH
-# export LD_LIBRARY_PATH=bin:$LD_LIBRARY_PATH
-
-# plantest "tdb wrappers" scripting/swig/torture/torture_tdb.py
-# plantest "ldb wrappers" scripting/swig/torture/torture_ldb.py
-
if test -f $samba4bindir/nsstest
then
plantest "NSS-TEST using winbind" member $VALGRIND $samba4bindir/nsstest $samba4bindir/shared/libnss_winbind.so