s4:setup/provision - make the interactive mode work again

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

diff --git a/source4/setup/provision b/source4/setup/provision
index ddcf1cffb2eb168ced9ca5be9948d4392bf27cca..f1aa07c7a7663fd5f90964c566e73ec64dd70162 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -122,14 +122,6 @@ def message(text):
 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:
-               print >>sys.stderr, "No domain set"
-       parser.print_usage()
-       sys.exit(1)
-
 if opts.interactive:
        from getpass import getpass
        import socket
@@ -137,19 +129,17 @@ if opts.interactive:
                if default is not None:
                        print "%s [%s]: " % (prompt,default),
                else:
-                       print "%s: " % (prompt,),
+                       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)
+               opts.realm = ask("Realm", None)
 
        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.domain = ask("Domain", None)
 
        opts.server_role = ask("Server Role (dc, member, standalone)", "dc")
        for i in range(3):
@@ -207,7 +197,7 @@ provision(setup_dir, message,
           wheel=opts.wheel, users=opts.users,
           serverrole=server_role, dom_for_fun_level=dom_for_fun_level,
           ldap_backend_extra_port=opts.ldap_backend_extra_port, 
-          ldap_backend_type=opts.ldap_backend_type,
+          backend_type=opts.ldap_backend_type,
           ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
           slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path,
           nosync=opts.nosync,ldap_dryrun_mode=opts.ldap_dryrun_mode)