diff options
author | Pavel Zuna <pzuna@redhat.com> | 2010-03-24 15:51:31 +0100 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2010-04-19 11:27:10 -0400 |
commit | 3620135ec97c156b84a310cd423d5df52732b3f8 (patch) | |
tree | 665eb48ad333da90acf0313e0005877954e4b9f7 /install/tools/ipa-compat-manage | |
parent | cc336cf9c17283684df7b850e010d669122126a5 (diff) | |
download | freeipa-3620135ec97c156b84a310cd423d5df52732b3f8.tar.gz freeipa-3620135ec97c156b84a310cd423d5df52732b3f8.tar.xz freeipa-3620135ec97c156b84a310cd423d5df52732b3f8.zip |
Use ldap2 instead of legacy LDAP code from v1 in installer scripts.
Diffstat (limited to 'install/tools/ipa-compat-manage')
-rwxr-xr-x | install/tools/ipa-compat-manage | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage index 09a06caa6..b22ce77f9 100755 --- a/install/tools/ipa-compat-manage +++ b/install/tools/ipa-compat-manage @@ -22,12 +22,11 @@ import sys try: from optparse import OptionParser - from ipaserver import ipaldap from ipapython import entity, ipautil, config from ipaserver.install import installutils from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax, UPDATES_DIR + from ipaserver.plugins.ldap2 import ldap2 from ipalib import errors - import ldap import logging import re import krbV @@ -95,26 +94,29 @@ def main(): else: dirman_password = get_dirman_password() + conn = None try: + ldapuri = 'ldap://%s' % installutils.get_fqdn() try: - conn = ipaldap.IPAdmin(installutils.get_fqdn()) - conn.do_simple_bind(bindpw=dirman_password) - except ldap.LDAPError, e: + conn = ldap2(shared_instance=False, ldap_uri=ldapuri, base_dn='') + conn.connect( + bind_dn='cn=directory manager', bind_pw=dirman_password + ) + except errors.LDAPError, e: print "An error occurred while connecting to the server." - print "%s" % e[0]['desc'] + print e return 1 if args[0] == "enable": try: - conn.getEntry("cn=Schema Compatibility,cn=plugins,cn=config", - ldap.SCOPE_BASE, "(objectclass=*)") + conn.get_entry('cn=Schema Compatibility,cn=plugins,cn=config') print "Plugin already Enabled" retval = 2 except errors.NotFound: print "Enabling plugin" - except ldap.LDAPError, e: + except errors.LDAPError, e: print "An error occurred while talking to the server." - print "%s" % e[0]['desc'] + print e retval = 1 if retval == 0: @@ -127,17 +129,15 @@ def main(): # Make a quick hack foir now, directly delete the entries by name, # In future we should add delete capabilites to LDAPUpdate try: - conn.getEntry("cn=Schema Compatibility,cn=plugins,cn=config", - ldap.SCOPE_BASE, "(objectclass=*)") - conn.deleteEntry("cn=groups,cn=Schema Compatibility,cn=plugins,cn=config") - conn.deleteEntry("cn=users,cn=Schema Compatibility,cn=plugins,cn=config") - conn.deleteEntry("cn=Schema Compatibility,cn=plugins,cn=config") + conn.delete_entry('cn=groups,cn=Schema Compatibility,cn=plugins,cn=config') + conn.delete_entry('cn=users,cn=Schema Compatibility,cn=plugins,cn=config') + conn.delete_entry('cn=Schema Compatibility,cn=plugins,cn=config') except errors.NotFound: print "Plugin is already disabled" retval = 2 - except ldap.LDAPError, e: + except errors.LDAPError, e: print "An error occurred while talking to the server." - print "%s" % e[0]['desc'] + print e retval = 1 else: @@ -145,7 +145,7 @@ def main(): finally: if conn: - conn.unbind() + conn.disconnect() return retval @@ -167,6 +167,6 @@ except config.IPAConfigError, e: print "An IPA server to update cannot be found. Has one been configured yet?" print "The error was: %s" % e sys.exit(1) -except ldap.LDAPError, e: +except errors.LDAPError, e: print "An error occurred while performing operations: %s" % e sys.exit(1) |