diff options
| -rw-r--r-- | ipapython/ipaldap.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/ipa_ldap_updater.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ipapython/ipaldap.py b/ipapython/ipaldap.py index 44918c39a..2818f787b 100644 --- a/ipapython/ipaldap.py +++ b/ipapython/ipaldap.py @@ -1204,6 +1204,10 @@ class LDAPClient(object): pass except ldap.CONNECT_ERROR: raise errors.DatabaseError(desc=desc, info=info) + except ldap.UNWILLING_TO_PERFORM: + raise errors.DatabaseError(desc=desc, info=info) + except ldap.AUTH_UNKNOWN: + raise errors.ACIError(info='%s (%s)' % (info,desc)) except ldap.LDAPError, e: if 'NOT_ALLOWED_TO_DELEGATE' in info: raise errors.ACIError( diff --git a/ipaserver/install/ipa_ldap_updater.py b/ipaserver/install/ipa_ldap_updater.py index fbbef142a..18970ce40 100644 --- a/ipaserver/install/ipa_ldap_updater.py +++ b/ipaserver/install/ipa_ldap_updater.py @@ -204,7 +204,8 @@ class LDAPUpdater_NonUpgrade(LDAPUpdater): modified = schemaupdate.update_schema( options.schema_files, dm_password=self.dirman_password, - live_run=not options.test) or modified + live_run=not options.test, + ldapi=options.ldapi) or modified if not self.files: self.files = ld.get_all_files(UPDATES_DIR) |