diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-06-22 10:58:43 +0000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-07-01 13:05:30 +0000 |
| commit | e39fe4ed31042bd28357d093fdbd93b4d6d59aaa (patch) | |
| tree | c9edd3b3d710ae642d91eb8ca0c060cb5f6d0f0c /install | |
| parent | 2d1515323acb4125306817096bafab6623de0b47 (diff) | |
| download | freeipa-e39fe4ed31042bd28357d093fdbd93b4d6d59aaa.tar.gz freeipa-e39fe4ed31042bd28357d093fdbd93b4d6d59aaa.tar.xz freeipa-e39fe4ed31042bd28357d093fdbd93b4d6d59aaa.zip | |
plugable: Pass API to plugins on initialization rather than using set_api
https://fedorahosted.org/freeipa/ticket/3090
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'install')
| -rwxr-xr-x | install/certmonger/dogtag-ipa-ca-renew-agent-submit | 2 | ||||
| -rw-r--r-- | install/restart_scripts/renew_ca_cert | 2 | ||||
| -rwxr-xr-x | install/tools/ipa-compat-manage | 2 | ||||
| -rwxr-xr-x | install/tools/ipa-nis-manage | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/install/certmonger/dogtag-ipa-ca-renew-agent-submit b/install/certmonger/dogtag-ipa-ca-renew-agent-submit index 66f3bf742..e833a3187 100755 --- a/install/certmonger/dogtag-ipa-ca-renew-agent-submit +++ b/install/certmonger/dogtag-ipa-ca-renew-agent-submit @@ -58,7 +58,7 @@ OPERATION_NOT_SUPPORTED_BY_HELPER = 6 def ldap_connect(): conn = None try: - conn = ldap2(shared_instance=False, ldap_uri=api.env.ldap_uri) + conn = ldap2(api) conn.connect(ccache=os.environ['KRB5CCNAME']) yield conn finally: diff --git a/install/restart_scripts/renew_ca_cert b/install/restart_scripts/renew_ca_cert index 95205e448..86f5765b7 100644 --- a/install/restart_scripts/renew_ca_cert +++ b/install/restart_scripts/renew_ca_cert @@ -140,7 +140,7 @@ def _main(): conn = None try: - conn = ldap2(shared_instance=False, ldap_uri=api.env.ldap_uri) + conn = ldap2(api) conn.connect(ccache=ccache_filename) except Exception, e: syslog.syslog( diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage index 23b528f83..7d9d20ccc 100755 --- a/install/tools/ipa-compat-manage +++ b/install/tools/ipa-compat-manage @@ -107,7 +107,7 @@ def main(): conn = None try: try: - conn = ldap2(shared_instance=False, base_dn='') + conn = ldap2(api) conn.connect( bind_dn=DN(('cn', 'directory manager')), bind_pw=dirman_password ) diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage index b412bb0f5..51cd6c323 100755 --- a/install/tools/ipa-nis-manage +++ b/install/tools/ipa-nis-manage @@ -120,7 +120,7 @@ def main(): conn = None try: try: - conn = ldap2(shared_instance=False, base_dn='') + conn = ldap2(api) conn.connect( bind_dn=DN(('cn', 'directory manager')), bind_pw=dirman_password ) |