From c5f135bf1b16ea3c27d5b3b62c5b751850e0df70 Mon Sep 17 00:00:00 2001
From: Stanislav Laznicka <slaznick@redhat.com>
Date: Apr 28 2016 15:32:14 +0000
Subject: 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>

---

diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage
index e7b0a78..d6d6ef8 100755
--- a/install/tools/ipa-replica-manage
+++ b/install/tools/ipa-replica-manage
@@ -70,7 +70,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):
@@ -620,15 +621,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)