From 84a3290c8f0adf1248e61ab9f6c88bcfd4650375 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 01:47:36 +0200
Subject: Fix python imports. (This used to be commit
 453206665677821b254c18cc67192e007b892f04)

---
 source4/setup/enableaccount | 2 +-
 source4/setup/newuser       | 2 +-
 source4/setup/setpassword   | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'source4/setup')

diff --git a/source4/setup/enableaccount b/source4/setup/enableaccount
index ad81042998..c2321606a6 100755
--- a/source4/setup/enableaccount
+++ b/source4/setup/enableaccount
@@ -14,7 +14,7 @@ import optparse
 import pwd
 import ldb
 
-from auth import system_session
+from samba.auth import system_session
 from samba.samdb import SamDB
 
 parser = optparse.OptionParser("setpassword [username] [options]")
diff --git a/source4/setup/newuser b/source4/setup/newuser
index 26bac76f02..991afa36d8 100755
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -15,7 +15,7 @@ import samba.getopt as options
 import optparse
 import pwd
 from getpass import getpass
-from auth import system_session
+from samba.auth import system_session
 from samba.samdb import SamDB
 
 parser = optparse.OptionParser("newuser [options] <username> [<password>]")
diff --git a/source4/setup/setpassword b/source4/setup/setpassword
index 977a6a5ee8..65770e1f4d 100644
--- a/source4/setup/setpassword
+++ b/source4/setup/setpassword
@@ -6,12 +6,17 @@
 #	Released under the GNU GPL version 3 or later
 #
 
+import os, 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.auth import system_session
 from samba.samdb import SamDB
 
 parser = optparse.OptionParser("setpassword [username] [options]")
-- 
cgit