<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<br>
<br>
<div class="moz-cite-prefix">On 07/26/2016 05:22 PM, Alexander
Bokovoy wrote:<br>
</div>
<blockquote cite="mid:20160726152219.u67pdvfxg4mwkogc@redhat.com"
type="cite">On Tue, 26 Jul 2016, Martin Babinsky wrote:
<br>
<blockquote type="cite">Fix for
<a class="moz-txt-link-freetext" href="https://fedorahosted.org/freeipa/ticket/6097">https://fedorahosted.org/freeipa/ticket/6097</a>
<br>
<br>
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.
<br>
<br>
[1] <a class="moz-txt-link-freetext" href="https://fedorahosted.org/freeipa/ticket/6041">https://fedorahosted.org/freeipa/ticket/6041</a>
<br>
</blockquote>
I have a preliminary patch for slapi-nis to fix 6041 (attached).
<br>
</blockquote>
<br>
The slapi-nis patch looks good to me.<br>
Ludwig may give the final ACK.<br>
<br>
thanks<br>
thierry<br>
<blockquote cite="mid:20160726152219.u67pdvfxg4mwkogc@redhat.com"
type="cite">
<br>
As for this fix -- ACK.
<br>
<br>
<blockquote type="cite">
<br>
-- <br>
Martin^3 Babinsky
<br>
</blockquote>
<br>
<blockquote type="cite">From
8f0d6dab08f61fe2fd1ad64a63f7ab91fc5227d4 Mon Sep 17 00:00:00
2001
<br>
From: Martin Babinsky <a class="moz-txt-link-rfc2396E" href="mailto:mbabinsk@redhat.com"><mbabinsk@redhat.com></a>
<br>
Date: Mon, 25 Jul 2016 14:05:08 +0200
<br>
Subject: [PATCH] baseldap: Fix MidairCollision instantiation
during entry
<br>
modification
<br>
<br>
<a class="moz-txt-link-freetext" href="https://fedorahosted.org/freeipa/ticket/6097">https://fedorahosted.org/freeipa/ticket/6097</a>
<br>
---
<br>
ipaserver/plugins/baseldap.py | 4 ++--
<br>
1 file changed, 2 insertions(+), 2 deletions(-)
<br>
<br>
diff --git a/ipaserver/plugins/baseldap.py
b/ipaserver/plugins/baseldap.py
<br>
index
6107e43a6ee17d9b9a63d9dc109664d8b232069f..f7844e3e7c59c259b9c8367d135b2dbefc3f0016
100644
<br>
--- a/ipaserver/plugins/baseldap.py
<br>
+++ b/ipaserver/plugins/baseldap.py
<br>
@@ -1466,7 +1466,7 @@ class LDAPUpdate(LDAPQuery, crud.Update):
<br>
entry_attrs.dn, attrs_list)
<br>
except errors.NotFound:
<br>
raise errors.MidairCollision(
<br>
- format=_('the entry was deleted while being
modified')
<br>
+ message=_('the entry was deleted while being
modified')
<br>
)
<br>
<br>
self.obj.get_indirect_members(entry_attrs, attrs_list)
<br>
@@ -2344,7 +2344,7 @@ class BaseLDAPModAttribute(LDAPQuery):
<br>
entry_attrs.dn, attrs_list)
<br>
except errors.NotFound:
<br>
raise errors.MidairCollision(
<br>
- format=_('the entry was deleted while being
modified')
<br>
+ message=_('the entry was deleted while being
modified')
<br>
)
<br>
<br>
for callback in self.get_callbacks('post'):
<br>
-- <br>
2.7.4
<br>
<br>
</blockquote>
<br>
<blockquote type="cite">-- <br>
Manage your subscription for the Freeipa-devel mailing list:
<br>
<a class="moz-txt-link-freetext" href="https://www.redhat.com/mailman/listinfo/freeipa-devel">https://www.redhat.com/mailman/listinfo/freeipa-devel</a>
<br>
Contribute to FreeIPA:
<a class="moz-txt-link-freetext" href="http://www.freeipa.org/page/Contribute/Code">http://www.freeipa.org/page/Contribute/Code</a>
<br>
</blockquote>
<br>
<br>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
</blockquote>
<br>
</body>
</html>