On 09/30/2014 09:00 AM, Martin Kosek wrote:
> On 09/29/2014 11:02 PM, Petr Viktorin wrote:
>> On 09/29/2014 04:32 PM, Jan Cholasta wrote:
>>> Dne 26.9.2014 v 19:40 Jan Cholasta napsal(a):
>>>> Dne 26.9.2014 v 17:37 Rob Crittenden napsal(a):
>>>>> Petr Viktorin wrote:
>>>>>> On 09/24/2014 06:13 PM, Jan Cholasta wrote:
>>>>>>> Hi,
>>>>>>>
>>>>>>> the attached patches fix
>>>>>>> <https://fedorahosted.org/freeipa/ticket/4480>
>>>>>>> and <https://fedorahosted.org/freeipa/ticket/4489>.
>>>>>>>
>>>>>>> (Note that design page for this is TBD.)
>>>>>
>>
>>>> IMO it's OK to just remove them, as they were added during 4.1
>>>> development and are not available in any released version of IPA.
>>>>
>>
>> Ah, OK
>>
>>>
>>> Added patch 341 for stricter CA certificate validation which fixes
>>> <https://fedorahosted.org/freeipa/ticket/4477>.
>>>
>>> Updated patches attached.
>>>
>>
>>
>> I didn't find any more issues
> 
> I understood that as an ACK, so I pushed to master, ipa-4-1 (to expedite
> preparations for 4.1 Alpha). I just had to do a minor conflict resolution for
> master branch.

Umh, and also had to fix a subsequent error caused by the merge - pushed as a
one liner (attached).

Martin
From 2421b13a9b8bd79084e9cfe488690057445d7aa7 Mon Sep 17 00:00:00 2001
From: Martin Kosek <mko...@redhat.com>
Date: Tue, 30 Sep 2014 09:35:28 +0200
Subject: [PATCH] Fix ImportError in ipa-ca-install

Patch 3aa0731f was not merged correctly and import for a function
that no longer exists. This patch fixes the import.

https://fedorahosted.org/freeipa/ticket/4480
---
 install/tools/ipa-ca-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index e54af2f59d805a2b8387c6d7fb64bb6b8e7cbd93..c984bf4778403f1a152afed2df567c8399e65809 100755
--- a/install/tools/ipa-ca-install
+++ b/install/tools/ipa-ca-install
@@ -29,7 +29,7 @@ from ipaserver.install import certs
 from ipaserver.install.installutils import (HostnameLocalhost, ReplicaConfig,
         expand_replica_info, read_replica_info, get_host_name, BadHostError,
         private_ccache, read_replica_info_dogtag_port, load_external_cert,
-        create_replica_config, validate_external_cert)
+        create_replica_config)
 from ipaserver.install import dsinstance, cainstance, bindinstance
 from ipaserver.install.replication import replica_conn_check
 from ipapython import version
-- 
1.9.3

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to