sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Matthias Dieter Wallnöfer
2009-11-27 13:02:31 +01:00
parent 7504b03b54
commit 6b835b0691
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source4/setup/provision
View File

@ -122,14 +122,6 @@ def message(text):
if len(sys.argv) == 1: if len(sys.argv) == 1:
opts.interactive = True 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: if opts.interactive:
from getpass import getpass from getpass import getpass
import socket import socket
@ -137,19 +129,17 @@ if opts.interactive:
if default is not None: if default is not None:
print "%s [%s]: " % (prompt,default), print "%s [%s]: " % (prompt,default),
else: else:
print "%s: " % (prompt,), print "%s: " % (prompt),
return sys.stdin.readline().rstrip("\n") or default return sys.stdin.readline().rstrip("\n") or default
try: try:
opts.realm = ask("Realm", socket.getfqdn().split(".", 1)[1].upper()) opts.realm = ask("Realm", socket.getfqdn().split(".", 1)[1].upper())
except IndexError: except IndexError:
print >>sys.stderr, "Cannot guess realm from %s" % ( socket.getfqdn()) opts.realm = ask("Realm", None)
sys.exit(1)
try: try:
opts.domain = ask("Domain", opts.realm.split(".")[0]) opts.domain = ask("Domain", opts.realm.split(".")[0])
except IndexError: except IndexError:
print >>sys.stderr, "Cannot guess domain from %s" % ( opts.realm()) opts.domain = ask("Domain", None)
sys.exit(1)
opts.server_role = ask("Server Role (dc, member, standalone)", "dc") opts.server_role = ask("Server Role (dc, member, standalone)", "dc")
for i in range(3): for i in range(3):