summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-21 15:39:00 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-21 15:39:00 +0200
commit19296758132dbc823911c4658df8fce183de2a86 (patch)
treebfeda111d7cfad4defb49bb94069effc70579488
parent721332411aac09b096f6add77c7c59c0a300ba1c (diff)
downloadsamba-19296758132dbc823911c4658df8fce183de2a86.tar.gz
samba-19296758132dbc823911c4658df8fce183de2a86.tar.bz2
samba-19296758132dbc823911c4658df8fce183de2a86.zip
Fix reference to removed smbpython.
(This used to be commit 58f956dc4591137489cba16f360f2d24d91dadc1)
-rwxr-xr-x[-rw-r--r--]source4/setup/enableaccount4
-rwxr-xr-xtestprogs/blackbox/test_kinit.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/setup/enableaccount b/source4/setup/enableaccount
index 849b515675..ad81042998 100644..100755
--- a/source4/setup/enableaccount
+++ b/source4/setup/enableaccount
@@ -5,11 +5,13 @@
# Copyright Jelmer Vernooij 2008
# Released under the GNU GPL version 3 or later
#
+import os, sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), "../bin/python"))
import samba.getopt as options
import optparse
import pwd
-import sys
import ldb
from auth import system_session
diff --git a/testprogs/blackbox/test_kinit.sh b/testprogs/blackbox/test_kinit.sh
index db4b65f327..d3cece0af7 100755
--- a/testprogs/blackbox/test_kinit.sh
+++ b/testprogs/blackbox/test_kinit.sh
@@ -23,7 +23,7 @@ samba4bindir=`dirname $0`/../../source/bin
smbclient=$samba4bindir/smbclient
samba4kinit=$samba4bindir/samba4kinit
net=$samba4bindir/net
-enableaccount="$samba4bindir/smbpython `dirname $0`/../../source/setup/enableaccount"
+enableaccount="$PYTHON `dirname $0`/../../source/setup/enableaccount"
. `dirname $0`/subunit.sh