install: remove dirman_pw from services

Remove directory manager's password from service's constructors

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

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>

2 files changed, 4 insertions, 6 deletions

diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index 985e7413a..bab87fa26 100755
--- a/install/tools/ipa-ca-install
+++ b/install/tools/ipa-ca-install
@@ -190,15 +190,14 @@ def install_replica(safe_options, options, filename):
         custodia.get_ca_keys(config.ca_host_name, ca_data[0], ca_data[1])
 
         CA = cainstance.CAInstance(config.realm_name, certs.NSS_DIR,
-                                   host_name=config.host_name,
-                                   dm_password=config.dirman_password)
+                                   host_name=config.host_name)
         CA.configure_replica(config.ca_host_name,
                              subject_base=config.subject_base,
                              ca_cert_bundle=ca_data)
         # Install CA DNS records
         if bindinstance.dns_container_exists(api.env.host, api.env.basedn,
                                              ldapi=True, realm=api.env.realm):
-            bind = bindinstance.BindInstance(ldapi=True)
+            bind = bindinstance.BindInstance()
             bind.update_system_records()
     else:
         ca.install(True, config, options)
diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage
index 5abc1d582..945d4215f 100755
--- a/install/tools/ipa-replica-manage
+++ b/install/tools/ipa-replica-manage
@@ -1123,8 +1123,7 @@ def add_link(realm, replica1, replica2, dirman_passwd, options):
 
     if options.cacert:
         # have to install the given CA cert before doing anything else
-        ds = dsinstance.DsInstance(realm_name = realm,
-                                   dm_password = dirman_passwd)
+        ds = dsinstance.DsInstance(realm_name=realm)
         if not ds.add_ca_cert(options.cacert):
             print("Could not load the required CA certificate file [%s]" % options.cacert)
             return
@@ -1214,7 +1213,7 @@ def re_initialize(realm, thishost, fromhost, dirman_passwd, nolookup=False):
         # If the agreement doesn't have nsDS5ReplicatedAttributeListTotal it means
         # we did not replicate memberOf, do so now.
         if not agreement.single_value.get('nsDS5ReplicatedAttributeListTotal'):
-            ds = dsinstance.DsInstance(realm_name = realm, dm_password = dirman_passwd)
+            ds = dsinstance.DsInstance(realm_name=realm)
             ds.ldapi = os.getegid() == 0
             ds.init_memberof()