mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-25 16:31:08 -06:00
Change ipa-compat-manage to work on older python versions too. Break try,except,finally into a try,try,finally,except Add also checks for LDAPError, errors.
This commit is contained in:
parent
b3b4435d0e
commit
80cc2c3715
@ -94,19 +94,27 @@ def main():
|
||||
else:
|
||||
dirman_password = get_dirman_password()
|
||||
|
||||
if args[0] == "enable":
|
||||
try:
|
||||
try:
|
||||
conn = ipaldap.IPAdmin(installutils.get_fqdn())
|
||||
conn.do_simple_bind(bindpw=dirman_password)
|
||||
except ldap.LDAPError, e:
|
||||
print "An error occurred while connecting to the server."
|
||||
print "%s" % e[0]['desc']
|
||||
return 1
|
||||
|
||||
if args[0] == "enable":
|
||||
try:
|
||||
conn.getEntry("cn=Schema Compatibility,cn=plugins,cn=config",
|
||||
ldap.SCOPE_BASE, "(objectclass=*)")
|
||||
print "Plugin already Enabled"
|
||||
retval = 2
|
||||
except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND):
|
||||
print "Enabling plugin"
|
||||
finally:
|
||||
if conn:
|
||||
conn.unbind()
|
||||
except ldap.LDAPError, e:
|
||||
print "An error occurred while talking to the server."
|
||||
print "%s" % e[0]['desc']
|
||||
retval = 1
|
||||
|
||||
if retval == 0:
|
||||
ld = LDAPUpdate(dm_password=dirman_password, sub_dict={})
|
||||
@ -118,8 +126,6 @@ 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 = ipaldap.IPAdmin(installutils.get_fqdn())
|
||||
conn.do_simple_bind(bindpw=dirman_password)
|
||||
conn.getEntry("cn=Schema Compatibility,cn=plugins,cn=config",
|
||||
ldap.SCOPE_BASE, "(objectclass=*)")
|
||||
conn.deleteEntry("cn=groups,cn=Schema Compatibility,cn=plugins,cn=config")
|
||||
@ -128,13 +134,18 @@ def main():
|
||||
except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND):
|
||||
print "Plugin is already disabled"
|
||||
retval = 2
|
||||
finally:
|
||||
if conn:
|
||||
conn.unbind()
|
||||
except ldap.LDAPError, e:
|
||||
print "An error occurred while talking to the server."
|
||||
print "%s" % e[0]['desc']
|
||||
retval = 1
|
||||
|
||||
else:
|
||||
retval = 1
|
||||
|
||||
finally:
|
||||
if conn:
|
||||
conn.unbind()
|
||||
|
||||
return retval
|
||||
|
||||
try:
|
||||
@ -155,3 +166,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 ipaerror, e:
|
||||
print "An error occurred while performing operations: %s" % e
|
||||
sys.exit(1)
|
||||
|
Loading…
Reference in New Issue
Block a user