IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

{ca,kra}instance: drop redundant URI argument from ad-hoc ldap2 connections

Browse Source 
Use the default LDAP URI from api.env.ldap_uri instead of specifying a
custom URI in the argument, as the custom URI is always the same as the
default URI.

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Jan Cholasta 2017-02-23 09:52:51 +00:00 committed by Martin Basti
parent e9cb74fd27
commit 935fcaea2e
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ipaserver/install/cainstance.py
View File

@ -738,9 +738,7 @@ class CAInstance(DogtagInstance):
cert_data = self.ra_cert.public_bytes(serialization.Encoding.DER)
# connect to CA database
server_id = installutils.realm_to_serverid(api.env.realm)
dogtag_uri = 'ldapi://%%2fvar%%2frun%%2fslapd-%s.socket' % server_id
conn = ldap2.ldap2(api, ldap_uri=dogtag_uri)
conn = ldap2.ldap2(api)
conn.connect(autobind=True)
# create ipara user with RA certificate
@ -1355,14 +1353,12 @@ def __update_entry_from_cert(make_filter, make_entry, dercert):
base_dn = DN(('o', 'ipaca'))
attempts = 0
server_id = installutils.realm_to_serverid(api.env.realm)
dogtag_uri = 'ldapi://%%2fvar%%2frun%%2fslapd-%s.socket' % server_id
updated = False
while attempts < 10:
conn = None
try:
conn = ldap2.ldap2(api, ldap_uri=dogtag_uri)
conn = ldap2.ldap2(api)
conn.connect(autobind=True)
db_filter = make_filter(dercert)
@ -1392,7 +1388,7 @@ def __update_entry_from_cert(make_filter, make_entry, dercert):
except errors.NetworkError:
syslog.syslog(
syslog.LOG_ERR,
'Connection to %s failed, sleeping 30s' % dogtag_uri)
'Connection to %s failed, sleeping 30s' % api.env.ldap_uri)
time.sleep(30)
attempts += 1
except Exception as e:
@ -1482,10 +1478,7 @@ def ensure_entry(dn, **attrs):
otherwise add the entry and return ``True``.
"""
server_id = installutils.realm_to_serverid(api.env.realm)
dogtag_uri = 'ldapi://%%2fvar%%2frun%%2fslapd-%s.socket' % server_id
conn = ldap2.ldap2(api, ldap_uri=dogtag_uri)
conn = ldap2.ldap2(api)
if not conn.isconnected():
conn.connect(autobind=True)
@ -1572,9 +1565,7 @@ def __get_profile_config(profile_id):
'/usr/share/ipa/profiles/{}.cfg'.format(profile_id), sub_dict)
def import_included_profiles():
server_id = installutils.realm_to_serverid(api.env.realm)
dogtag_uri = 'ldapi://%%2fvar%%2frun%%2fslapd-%s.socket' % server_id
conn = ldap2.ldap2(api, ldap_uri=dogtag_uri)
conn = ldap2.ldap2(api)
if not conn.isconnected():
conn.connect(autobind=True)

4
ipaserver/install/krainstance.py
View File

@ -306,9 +306,7 @@ class KRAInstance(DogtagInstance):
cert_data = cert.public_bytes(serialization.Encoding.DER)
# connect to KRA database
server_id = installutils.realm_to_serverid(api.env.realm)
dogtag_uri = 'ldapi://%%2fvar%%2frun%%2fslapd-%s.socket' % server_id
conn = ldap2.ldap2(api, ldap_uri=dogtag_uri)
conn = ldap2.ldap2(api)
conn.connect(autobind=True)
# create ipakra user with RA agent certificate