The branch, master has been updated
via a7fa3a9... s4:provision.py - cosmetic output correction
via 6b835b0... s4:setup/provision - make the interactive mode work again
from 7504b03... s4:WHATSNEW4.txt - Add also here a comment about the
"upgrade_from_s3" script
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a7fa3a9703bf9f0c72031c84998f4fb21ba95429
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Nov 27 13:07:52 2009 +0100
s4:provision.py - cosmetic output correction
commit 6b835b0691faab904246e587ffa6ff74b9fb53e2
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Fri Nov 27 13:02:31 2009 +0100
s4:setup/provision - make the interactive mode work again
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/provision.py | 2 +-
source4/setup/provision | 16 +++-------------
2 files changed, 4 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/provision.py
b/source4/scripting/python/samba/provision.py
index 2e7843a..32286dc 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1322,7 +1322,7 @@ def provision(setup_dir, message, session_info,
message("DNS Domain: %s" % names.dnsdomain)
message("DOMAIN SID: %s" % str(domainsid))
if samdb_fill == FILL_FULL:
- message("Admin password: %s" % adminpass)
+ message("Admin password: %s" % adminpass)
if provision_backend.type is not "ldb":
if provision_backend.credentials.get_bind_dn() is not None:
message("LDAP Backend Admin DN: %s" %
provision_backend.credentials.get_bind_dn())
diff --git a/source4/setup/provision b/source4/setup/provision
index ed350dd..f1aa07c 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):
--
Samba Shared Repository
