diff options
| author | Martin Kosek <mkosek@redhat.com> | 2012-05-11 16:59:56 +0200 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-05-17 21:21:47 -0400 |
| commit | aa9ea477af7be67d59f204af4e0da67fd8cfd862 (patch) | |
| tree | 12072ceae169c23a7db2c24143900a30da7cf32a /ipaserver/ipaldap.py | |
| parent | 560f2ce8bd0525189e45ff7d8f8d4df11f9c20ff (diff) | |
| download | freeipa.git-aa9ea477af7be67d59f204af4e0da67fd8cfd862.tar.gz freeipa.git-aa9ea477af7be67d59f204af4e0da67fd8cfd862.tar.xz freeipa.git-aa9ea477af7be67d59f204af4e0da67fd8cfd862.zip | |
Remove ipa-server-install LDAP update errors
python-ldap add_s method raises a NO_SUCH_OBJECT exception when
a parent entry of the entry being added does not exist. This may
not be an error, for example NIS entries are only added when NIS
is enabled and thus the NIS entry container exists.
The exception raised by python-ldap is also incorrectly processed
in ipaldap's addEntry function and an irrelevant exception is
re-raised instead.
Fix LDAP updater to just log an information when an object cannot
be added due to missing parent object. Also make sure that the
addEntry function exception processing provides the right exception
with a useful description.
https://fedorahosted.org/freeipa/ticket/2520
https://fedorahosted.org/freeipa/ticket/2743
Diffstat (limited to 'ipaserver/ipaldap.py')
| -rw-r--r-- | ipaserver/ipaldap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py index 23279aa0..8b5451c7 100644 --- a/ipaserver/ipaldap.py +++ b/ipaserver/ipaldap.py @@ -492,7 +492,7 @@ class IPAdmin(IPAEntryLDAPObject): self.set_option(ldap.OPT_SERVER_CONTROLS, sctrl) self.add_s(entry.dn, entry.toTupleList()) except ldap.LDAPError, e: - arg_desc = 'entry=%s' % (entry) + arg_desc = 'entry=%s' % (entry.toTupleList()) self.__handle_errors(e, arg_desc=arg_desc) return True |