From 0f35c4a242db4dd545bfacd86d38e596e06454bc Mon Sep 17 00:00:00 2001 From: Björn Baumbach Date: Thu, 8 Mar 2012 15:27:05 +0100 Subject: s4-provision: add password verification in interactive mode Since we do not print the password out (anymore), it is necessary to verify the entered password. Signed-off-by: Michael Adam --- source4/setup/provision | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'source4/setup/provision') diff --git a/source4/setup/provision b/source4/setup/provision index 4316ad00c6..57183540db 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -165,11 +165,17 @@ if opts.interactive: opts.server_role = ask("Server Role (dc, member, standalone)", "dc") for i in range(3): - opts.adminpass = getpass("Administrator password: ") - if not opts.adminpass: + adminpass = getpass("Administrator password: ") + if not adminpass: print >>sys.stderr, "Invalid administrator password." else: - break + adminpassverify = getpass("Retype password: ") + if not adminpass == adminpassverify: + print >>sys.stderr, "Sorry, passwords do not match." + else: + opts.adminpass = adminpass + break + else: if opts.realm in (None, ""): opts.realm = sambaopts._lp.get('realm') -- cgit