IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix directory manager password validation in ipa-nis-manage.

Browse Source 
ticket 1283, 1284
This commit is contained in:
Jan Cholasta
2011-06-08 14:39:50 +02:00
committed by Martin Kosek
parent 645e55651e
commit d2b483cbb3
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
install/tools/ipa-nis-manage
View File

@@ -62,7 +62,7 @@ def get_dirman_password():
"""Prompt the user for the Directory Manager password and verify its
correctness.
"""
password = installutils.read_password("Directory Manager", confirm=False, validate=False)
password = installutils.read_password("Directory Manager", confirm=False, validate=False, retry=False)
return password
@@ -101,11 +101,17 @@ def main():
dirman_password = ""
if options.password:
pw = ipautil.template_file(options.password, [])
try:
pw = ipautil.template_file(options.password, [])
except IOError:
sys.exit("File \"%s\" not found or not readable" % options.password)
dirman_password = pw.strip()
else:
dirman_password = get_dirman_password()
if not dirman_password:
sys.exit("No password supplied")
api.bootstrap(context='cli', debug=options.debug)
api.finalize()