[Freeipa-devel] [PATCH 0196] baseldap: Fix MidairCollision instantiation during entry modification

[Lenka Doudova]

On 07/26/2016 05:22 PM, Alexander Bokovoy wrote:
> On Tue, 26 Jul 2016, Martin Babinsky wrote:
>> Fix for https://fedorahosted.org/freeipa/ticket/6097
>>
>> Since this issue was found during investigation of other ticket[1], 
>> you can test it by performing steps to reproduce #6041, but instead 
>> of internal error you should see the MidairCollision raised as public 
>> error with the right error message.
>>
>> [1] https://fedorahosted.org/freeipa/ticket/6041
> I have a preliminary patch for slapi-nis to fix 6041 (attached).

Bump for review on this.


>
> As for this fix -- ACK.
>
>>
>> -- 
>> Martin^3 Babinsky
>
>> From 8f0d6dab08f61fe2fd1ad64a63f7ab91fc5227d4 Mon Sep 17 00:00:00 2001
>> From: Martin Babinsky <mbabinsk at redhat.com>
>> Date: Mon, 25 Jul 2016 14:05:08 +0200
>> Subject: [PATCH] baseldap: Fix MidairCollision instantiation during 
>> entry
>> modification
>>
>> https://fedorahosted.org/freeipa/ticket/6097
>> ---
>> ipaserver/plugins/baseldap.py | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/ipaserver/plugins/baseldap.py 
>> b/ipaserver/plugins/baseldap.py
>> index 
>> 6107e43a6ee17d9b9a63d9dc109664d8b232069f..f7844e3e7c59c259b9c8367d135b2dbefc3f0016 
>> 100644
>> --- a/ipaserver/plugins/baseldap.py
>> +++ b/ipaserver/plugins/baseldap.py
>> @@ -1466,7 +1466,7 @@ class LDAPUpdate(LDAPQuery, crud.Update):
>>                 entry_attrs.dn, attrs_list)
>>         except errors.NotFound:
>>             raise errors.MidairCollision(
>> -                format=_('the entry was deleted while being modified')
>> +                message=_('the entry was deleted while being modified')
>>             )
>>
>>         self.obj.get_indirect_members(entry_attrs, attrs_list)
>> @@ -2344,7 +2344,7 @@ class BaseLDAPModAttribute(LDAPQuery):
>>                 entry_attrs.dn, attrs_list)
>>         except errors.NotFound:
>>             raise errors.MidairCollision(
>> -                format=_('the entry was deleted while being modified')
>> +                message=_('the entry was deleted while being modified')
>>             )
>>
>>         for callback in self.get_callbacks('post'):
>> -- 
>> 2.7.4
>>
>
>> -- 
>> Manage your subscription for the Freeipa-devel mailing list:
>> https://www.redhat.com/mailman/listinfo/freeipa-devel
>> Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
>
>
>
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20160804/f7a6d5dc/attachment.htm>