Use system python rather than smbpython.

5 files changed, 9 insertions, 3 deletions

diff --git a/source/lib/ldb/tests/python/ldap.py b/source/lib/ldb/tests/python/ldap.py
index ead5796b7b6..7cbe6e5e7d5 100755
--- a/source/lib/ldb/tests/python/ldap.py
+++ b/source/lib/ldb/tests/python/ldap.py
@@ -6,6 +6,8 @@ import getopt
 import optparse
 import sys
 
+sys.path.append("bin/python")
+
 import samba.getopt as options
 
 from auth import system_session
diff --git a/source/scripting/bin/subunitrun b/source/scripting/bin/subunitrun
index fbbffde42cd..719a58d9e50 100755
--- a/source/scripting/bin/subunitrun
+++ b/source/scripting/bin/subunitrun
@@ -17,8 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from subunit import SubunitTestRunner
 import sys
+sys.path.append("bin/python")
+
+from subunit import SubunitTestRunner
 from unittest import TestProgram
 import optparse
 import os
diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 725fde2c7d4..287274f6694 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -328,7 +328,7 @@ then
 	plantest "nss.test using winbind" member $VALGRIND $samba4bindir/nsstest $samba4bindir/shared/libnss_winbind.so
 fi
 
-PYTHON=bin/smbpython
+PYTHON=/usr/bin/python
 SUBUNITRUN="$PYTHON ./scripting/bin/subunitrun"
 plantest "ldb.python" none PYTHONPATH="$PYTHONPATH:lib/ldb/tests/python/" $SUBUNITRUN api
 plantest "credentials.python" none PYTHONPATH="$PYTHONPATH:auth/credentials/tests" $SUBUNITRUN bindings
diff --git a/source/selftest/target/Samba4.pm b/source/selftest/target/Samba4.pm
index 9488ae3e040..a12939b0a17 100644
--- a/source/selftest/target/Samba4.pm
+++ b/source/selftest/target/Samba4.pm
@@ -705,7 +705,7 @@ nogroup:x:65534:nobody
 		push (@provision_options, "$self->{bindir}/smbscript");
 		push (@provision_options, "$self->{setupdir}/provision.js");
 	} else {
-		push (@provision_options, "$self->{bindir}/smbpython");
+#		push (@provision_options, "$self->{bindir}/smbpython");
 		push (@provision_options, "$self->{setupdir}/provision");
 	}
 	push (@provision_options, split(' ', $configuration));
diff --git a/source/setup/provision b/source/setup/provision
index b748dab3399..ad289aaaa31 100755
--- a/source/setup/provision
+++ b/source/setup/provision
@@ -26,6 +26,8 @@ import getopt
 import optparse
 import os, sys
 
+sys.path.append("bin/python")
+
 import samba
 import param