From: Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Date: Fri, 27 Nov 2009 12:02:31 +0000 (+0100)
Subject: s4:setup/provision - make the interactive mode work again
X-Git-Tag: samba-4.0.0alpha9~113
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=6b835b0691faab904246e587ffa6ff74b9fb53e2;hp=7504b03b541026c84a4f454b7572a3280296a8d9

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

diff --git a/source4/setup/provision b/source4/setup/provision
index ed350dd46a8..f1aa07c7a76 100755
--- 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):