From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 14 Jan 2009 09:31:58 +0000 (+1100)
Subject: Don't give fatal python errors when guessing the realm
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=b7cafb98429f45e2aad10e683618da4626da5c84;p=metze%2Fsamba%2Fwip.git

Don't give fatal python errors when guessing the realm
---

diff --git a/source4/setup/provision b/source4/setup/provision
index 55a438cb659a..55535cfd4ac5 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -129,8 +129,18 @@ if opts.interactive:
 		else:
 			print "%s: " % (prompt,),
 		return sys.stdin.readline().rstrip("\n") or default
-	opts.realm = ask("Realm", socket.getfqdn().split(".", 1)[1].upper())
-	opts.domain = ask("Domain", opts.realm.split(".")[0])
+	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: ")