diff options
| author | Pavel Zuna <pzuna@redhat.com> | 2011-02-15 14:11:27 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2011-03-03 14:04:34 -0500 |
| commit | 64575a411b27dde7919406fdaf5bdec07c6645f3 (patch) | |
| tree | ab0870adf6181f4457959f44fb936ec705f741d2 /install/tools/ipa-replica-prepare | |
| parent | eb6b3c7afc4065f12960f09791f2a5b645abef8b (diff) | |
| download | freeipa-64575a411b27dde7919406fdaf5bdec07c6645f3.tar.gz freeipa-64575a411b27dde7919406fdaf5bdec07c6645f3.tar.xz freeipa-64575a411b27dde7919406fdaf5bdec07c6645f3.zip | |
Use ldapi: instead of unsecured ldap: in ipa core tools.
The patch also corrects exception handling in some of the tools.
Fix #874
Diffstat (limited to 'install/tools/ipa-replica-prepare')
| -rwxr-xr-x | install/tools/ipa-replica-prepare | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare index f0661a37..36e34d78 100755 --- a/install/tools/ipa-replica-prepare +++ b/install/tools/ipa-replica-prepare @@ -88,9 +88,8 @@ def parse_options(): return options, args def get_subject_base(host_name, dm_password, suffix): - ldapuri = 'ldap://%s:389' % host_name try: - conn = ldap2(shared_instance=False, ldap_uri=ldapuri, base_dn=suffix) + conn = ldap2(shared_instance=False, base_dn=suffix) conn.connect(bind_dn='cn=directory manager', bind_pw=dm_password) except errors.ExecutionError, e: logging.critical("Could not connect to the Directory Server on %s" % host_name) @@ -285,9 +284,8 @@ def main(): sys.exit(0) # Try out the password - ldapuri = 'ldap://%s:389' % api.env.host try: - conn = ldap2(shared_instance=False, ldap_uri=ldapuri) + conn = ldap2(shared_instance=False) conn.connect(bind_dn='cn=directory manager', bind_pw=dirman_password) conn.disconnect() except errors.ACIError: |