--interactive doesn't take any argument.

[ira/wip.git] / source4 / setup / provision

diff --git a/source4/setup/provision b/source4/setup/provision
index 259bd814a4be20e07cdd2c48ac4fdb36b947ccbb..eab5d09424d066add9d10c9cb6fe8c9c35be1b2c 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -24,16 +24,20 @@
 
 import getopt
 import optparse
-import os, sys
+import os
+import sys
 
-import samba
-import param
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
 
-from auth import system_session
+import samba
+from samba.credentials import DONT_USE_KERBEROS
+from samba.auth import system_session
 import samba.getopt as options
-from samba.provision import (provision, 
-                             FILL_FULL, FILL_NT4SYNC,
-                             FILL_DRS)
+from samba import param
+from samba.provision import provision, FILL_FULL, FILL_NT4SYNC, FILL_DRS
+
+# how do we make this case insensitive??
 
 parser = optparse.OptionParser("provision [options]")
 sambaopts = options.SambaOptions(parser)
@@ -41,6 +45,7 @@ parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
+parser.add_option("--interactive", help="Ask for names", action="store_true")
 parser.add_option("--setupdir", type="string", metavar="DIR", 
                help="directory with setup files")
 parser.add_option("--realm", type="string", metavar="REALM", help="set realm")
@@ -103,7 +108,10 @@ def message(text):
        if not opts.quiet:
                print text
 
-if opts.realm is None or opts.domain is None:
+if len(sys.argv) == 1:
+       opts.interactive = True
+
+if not opts.interactive and (opts.realm is None or opts.domain is None):
        if opts.realm is None:
                print >>sys.stderr, "No realm set"
        if opts.domain is None:
@@ -111,8 +119,38 @@ if opts.realm is None or opts.domain is None:
        parser.print_usage()
        sys.exit(1)
 
+if opts.interactive:
+       from getpass import getpass
+       import readline
+       import socket
+       def ask(prompt, default=None):
+               if default is not None:
+                       print "%s [%s]: " % (prompt,default),
+               else:
+                       print "%s: " % (prompt,),
+               return sys.stdin.readline().rstrip("\n") or default
+       try:
+               opts.realm = ask("Realm", socket.getfqdn().split(".", 1)[1].upper())
+       except IndexError:
+               print >>sys.stderr, "Cannot guess realm from %s" % ( socket.getfqdn())
+               sys.exit(1)
+
+       try:
+               opts.domain = ask("Domain", opts.realm.split(".")[0])
+       except IndexError:
+               print >>sys.stderr, "Cannot guess domain from %s" % ( opts.realm())
+               sys.exit(1)
+
+       opts.server_role = ask("Server Role (dc, member, standalone)", "dc")
+       for i in range(3):
+               opts.adminpass = getpass("Administrator password: ")
+               if not opts.adminpass:
+                       print >>sys.stderr, "Invalid administrator password."
+               else:
+                       break
+
 lp = sambaopts.get_loadparm()
-smbconf = lp.configfile()
+smbconf = lp.configfile
 
 if opts.aci is not None:
        print "set ACI: %s" % opts.aci
@@ -122,13 +160,15 @@ if opts.server_role == "dc":
 elif opts.server_role == "member":
        server_role = "member server"
 else:
-        server_role = opts.server_role
+       server_role = opts.server_role
 
 creds = credopts.get_credentials(lp)
 
+creds.set_kerberos_state(DONT_USE_KERBEROS)
+
 setup_dir = opts.setupdir
 if setup_dir is None:
-       setup_dir = "setup"
+       setup_dir = os.path.dirname(__file__)
 
 samdb_fill = FILL_FULL
 if opts.blank:
@@ -136,8 +176,9 @@ if opts.blank:
 elif opts.partitions_only:
     samdb_fill = FILL_DRS
 
+session = system_session()
 provision(setup_dir, message, 
-          system_session(), creds, smbconf=smbconf, targetdir=opts.targetdir,
+          session, creds, smbconf=smbconf, targetdir=opts.targetdir,
           samdb_fill=samdb_fill, realm=opts.realm, domain=opts.domain,
           domainguid=opts.domain_guid, domainsid=opts.domain_sid,
           policyguid=opts.policy_guid, hostname=opts.host_name,