IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 15:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

ca install: merge duplicated code for DM password

Browse Source 
Extract copy-pasted code to a single function.

Related https://pagure.io/freeipa/issue/6892

Signed-off-by: Tomas Krizek <tkrizek@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Tomas Krizek 2017-05-03 10:05:25 +02:00 committed by Martin Basti
parent 89a5bb2c6b
commit 80d61c2e01
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
install/tools/ipa-ca-install
View File

@ -116,9 +116,19 @@ def parse_options():
return safe_options, options, filename
def get_dirman_password():
return installutils.read_password(
"Directory Manager (existing master)", confirm=False, validate=False)
def _get_dirman_password(password=None, unattended=False):
if not password:
if unattended:
sys.exit('Directory Manager password required')
try:
password = installutils.read_password(
"Directory Manager (existing master)", confirm=False,
validate=False)
except KeyboardInterrupt:
sys.exit(0)
if password is None:
sys.exit("Directory Manager password required")
return password
def install_replica(safe_options, options, filename):
@ -142,16 +152,8 @@ def install_replica(safe_options, options, filename):
check_creds(options, api.env.realm)
# get the directory manager password
dirman_password = options.password
if not dirman_password:
if options.unattended:
sys.exit('Directory Manager password required')
try:
dirman_password = get_dirman_password()
except KeyboardInterrupt:
sys.exit(0)
if dirman_password is None:
sys.exit("Directory Manager password required")
dirman_password = _get_dirman_password(
options.password, options.unattended)
if (not options.promote and not options.admin_password and
not options.skip_conncheck and options.unattended):
@ -199,16 +201,8 @@ def install_replica(safe_options, options, filename):
def install_master(safe_options, options):
dm_password = options.password
if not dm_password:
if options.unattended:
sys.exit('Directory Manager password required')
try:
dm_password = get_dirman_password()
except KeyboardInterrupt:
sys.exit(0)
if dm_password is None:
sys.exit("Directory Manager password required")
dm_password = _get_dirman_password(
options.password, options.unattended)
options.realm_name = api.env.realm
options.domain_name = api.env.domain