diff options
| author | Stanislav Laznicka <slaznick@redhat.com> | 2016-03-16 12:28:36 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-04-28 17:32:14 +0200 |
| commit | c34af691def03313b61a231b85213c8f20e44cfa (patch) | |
| tree | 6349ce35be7667f44bb0a899760c852dcfabb700 /install/tools | |
| parent | ee05442e5d65766774c18679af78f21a12309730 (diff) | |
| download | freeipa-c34af691def03313b61a231b85213c8f20e44cfa.tar.gz freeipa-c34af691def03313b61a231b85213c8f20e44cfa.tar.xz freeipa-c34af691def03313b61a231b85213c8f20e44cfa.zip | |
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>
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-replica-manage | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index 567970f82..4855a352b 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -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) |
