summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/adtrustinstance.py
diff options
context:
space:
mode:
authorTomas Krizek <tkrizek@redhat.com>2016-10-06 17:35:04 +0200
committerMartin Basti <mbasti@redhat.com>2016-11-07 11:34:03 +0100
commit9340a1417acf120fed3e9ffbe9d658d3456743a1 (patch)
tree8e01407f76908b39b774ae76cbc952d653559090 /ipaserver/install/adtrustinstance.py
parent5b81dbfda1e4f0799d4ce87e9987a896af3ff299 (diff)
downloadfreeipa-9340a1417acf120fed3e9ffbe9d658d3456743a1.tar.gz
freeipa-9340a1417acf120fed3e9ffbe9d658d3456743a1.tar.xz
freeipa-9340a1417acf120fed3e9ffbe9d658d3456743a1.zip
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>
Diffstat (limited to 'ipaserver/install/adtrustinstance.py')
-rw-r--r--ipaserver/install/adtrustinstance.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index 49389859d..1dfcf96f7 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -137,8 +137,7 @@ class ADTRUSTInstance(service.Service):
self.host_netbios_name = None
self.realm = None
- service.Service.__init__(self, "smb", service_desc="CIFS",
- dm_password=None, ldapi=True)
+ service.Service.__init__(self, "smb", service_desc="CIFS")
if fstore:
self.fstore = fstore
@@ -740,14 +739,12 @@ class ADTRUSTInstance(service.Service):
# Note that self.dm_password is None for ADTrustInstance because
# we ensure to be called as root and using ldapi to use autobind
try:
- self.ldap_enable('ADTRUST', self.fqdn, self.dm_password, \
- self.suffix)
+ self.ldap_enable('ADTRUST', self.fqdn, None, self.suffix)
except (ldap.ALREADY_EXISTS, errors.DuplicateEntry):
root_logger.info("ADTRUST Service startup entry already exists.")
try:
- self.ldap_enable('EXTID', self.fqdn, self.dm_password, \
- self.suffix)
+ self.ldap_enable('EXTID', self.fqdn, None, self.suffix)
except (ldap.ALREADY_EXISTS, errors.DuplicateEntry):
root_logger.info("EXTID Service startup entry already exists.")