r26475: Add ldb.set_credentials function.

(This used to be commit dbebb4ef477d2c8de7b8d1e5cde9b9dada47044f)

2 files changed, 12 insertions, 6 deletions

diff --git a/source4/setup/provision.py b/source4/setup/provision.py
index 38312f2946..71360cecc8 100755
--- a/source4/setup/provision.py
+++ b/source4/setup/provision.py
@@ -24,15 +24,16 @@ import optparse
 import sys
 
 # Add path to the library for in-tree use
-sys.path.append("bin/python")
 sys.path.append("scripting/python")
 
+import samba
+
 from auth import system_session
 import samba.getopt as options
 import param
 from samba.provision import (provision, provision_guess, 
-		                     provision_default_paths, provision_ldapbase, 
-							 provision_dns)
+                             provision_default_paths, provision_ldapbase, 
+                             provision_dns)
 
 parser = optparse.OptionParser("provision [options]")
 parser.add_option_group(options.SambaOptions(parser))
diff --git a/source4/setup/upgrade.py b/source4/setup/upgrade.py
index e5e6d2c832..96584a1026 100755
--- a/source4/setup/upgrade.py
+++ b/source4/setup/upgrade.py
@@ -6,7 +6,10 @@
 #
 import getopt
 import optparse
-import samba.options
+import sys
+sys.path.append("scripting/python")
+import samba
+import samba.getopt
 
 parser = optparse.OptionParser("upgrade [options]")
 parser.add_option_group(options.SambaOptions(parser))
@@ -20,10 +23,12 @@ parser.add_option("--blank",
 parser.add_option("--targetdir", type="string", metavar="DIR", 
 		          help="Set target directory")
 
+opts = parser.parse_args()[0]
+
 def message(text):
     """Print a message if quiet is not set."""
-	if opts.quiet:
-		print text
+    if opts.quiet:
+        print text
 
 message("Reading Samba3 databases and smb.conf\n")
 samba3 = samba3_read(options.ARGV[0], options.ARGV[1])