svn commit: samba r26474 - in branches/SAMBA_4_0: . source source/auth/credentials source/auth/kerberos source/scripting/python source/scripting/python/samba source/selftest

jelmer at samba.org jelmer at samba.org
Sun Dec 16 15:33:59 GMT 2007


Author: jelmer
Date: 2007-12-16 15:33:58 +0000 (Sun, 16 Dec 2007)
New Revision: 26474

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26474

Log:
Move credentials-specific kerberos file to credentials subsystem. Fixes missing symbols in some of the python bindings.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/auth/credentials/config.mk
   branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.h
   branches/SAMBA_4_0/source/auth/kerberos/config.mk
   branches/SAMBA_4_0/source/samba4-skip
   branches/SAMBA_4_0/source/scripting/python/config.mk
   branches/SAMBA_4_0/source/scripting/python/samba/__init__.py
   branches/SAMBA_4_0/source/selftest/samba4_tests.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/auth/credentials/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/config.mk	2007-12-16 14:51:23 UTC (rev 26473)
+++ branches/SAMBA_4_0/source/auth/credentials/config.mk	2007-12-16 15:33:58 UTC (rev 26474)
@@ -17,9 +17,10 @@
 [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
 #################################
 

Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.h
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.h	2007-12-16 14:51:23 UTC (rev 26473)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.h	2007-12-16 15:33:58 UTC (rev 26474)
@@ -21,6 +21,7 @@
 */
 
 #include <gssapi/gssapi.h>
+#include <krb5.h>
 
 struct ccache_container;
 

Modified: branches/SAMBA_4_0/source/auth/kerberos/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/config.mk	2007-12-16 14:51:23 UTC (rev 26473)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.mk	2007-12-16 15:33:58 UTC (rev 26474)
@@ -5,11 +5,10 @@
 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
 #################################

Modified: branches/SAMBA_4_0/source/samba4-skip
===================================================================
--- branches/SAMBA_4_0/source/samba4-skip	2007-12-16 14:51:23 UTC (rev 26473)
+++ branches/SAMBA_4_0/source/samba4-skip	2007-12-16 15:33:58 UTC (rev 26474)
@@ -49,6 +49,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

Modified: branches/SAMBA_4_0/source/scripting/python/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/config.mk	2007-12-16 14:51:23 UTC (rev 26473)
+++ branches/SAMBA_4_0/source/scripting/python/config.mk	2007-12-16 15:33:58 UTC (rev 26474)
@@ -25,3 +25,7 @@
 
 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/*

Modified: branches/SAMBA_4_0/source/scripting/python/samba/__init__.py
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/samba/__init__.py	2007-12-16 14:51:23 UTC (rev 26473)
+++ branches/SAMBA_4_0/source/scripting/python/samba/__init__.py	2007-12-16 15:33:58 UTC (rev 26474)
@@ -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. 
 

Modified: branches/SAMBA_4_0/source/selftest/samba4_tests.sh
===================================================================
--- branches/SAMBA_4_0/source/selftest/samba4_tests.sh	2007-12-16 14:51:23 UTC (rev 26473)
+++ branches/SAMBA_4_0/source/selftest/samba4_tests.sh	2007-12-16 15:33:58 UTC (rev 26474)
@@ -212,7 +212,7 @@
    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 @@
 	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



More information about the samba-cvs mailing list