Merge branch 'nosmbpython' into v4-0-test

(This used to be commit 9683f7434c7ea01631d8adae9d43274c77ff51de)

3 files changed, 12 insertions, 1 deletions

diff --git a/source4/setup/newuser b/source4/setup/newuser
index 04a5440ee1..26bac76f02 100755
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -6,10 +6,14 @@
 #	Released under the GNU GPL version 3 or later
 #
 
+import sys
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 import samba.getopt as options
 import optparse
 import pwd
-import sys
 from getpass import getpass
 from auth import system_session
 from samba.samdb import SamDB
diff --git a/source4/setup/provision b/source4/setup/provision
index b748dab339..2579bc4f19 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -26,6 +26,9 @@ import getopt
 import optparse
 import os, sys
 
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 import samba
 import param
 
diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index 3bcc57ab64..b1d9ffa37c 100755
--- a/source4/setup/upgrade
+++ b/source4/setup/upgrade
@@ -7,6 +7,10 @@
 import getopt
 import optparse
 import os, sys
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 import param
 import samba
 import samba.getopt as options