Moved password check from clean_dangling_ruv

The proper password check is now done elsewhere

https://fedorahosted.org/freeipa/ticket/4987

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Stanislav Laznicka 2016-03-16 12:28:36 +01:00 committed by Martin Basti
parent ee05442e5d
commit c34af691de

View File

@ -69,7 +69,8 @@ commands = {
}
# tuple of commands that work with ca tree and need Directory Manager password
dirman_passwd_req_commands = ("list-ruv", "clean-ruv", "abort-clean-ruv")
dirman_passwd_req_commands = ("list-ruv", "clean-ruv", "abort-clean-ruv",
"clean-dangling-ruv")
class NoRUVsFound(Exception):
@ -619,15 +620,6 @@ def clean_dangling_ruvs(realm, host, options):
Cleans all RUVs and CS-RUVs that are left in the system from
uninstalled replicas
"""
# get the Directory Manager password
if not options.dirman_passwd:
options.dirman_passwd = installutils.read_password('Directory Manager',
confirm=False,
validate=False,
retry=False)
if options.dirman_passwd is None:
sys.exit('Directory Manager password is required')
conn = ipaldap.IPAdmin(host, 636, cacert=CACERT)
try:
conn.do_simple_bind(bindpw=options.dirman_passwd)