On 27.8.2015 07:56, Jan Cholasta wrote:
On 25.8.2015 20:43, Simo Sorce wrote:
On Wed, 2015-08-05 at 11:24 -0400, Simo Sorce wrote:
On Wed, 2015-08-05 at 08:20 +0200, Jan Cholasta wrote:
Hi,

Dne 31.7.2015 v 12:46 Simo Sorce napsal(a):
I've been carrying these patches in my tree for a while, I think it is
time to put them in master as they stand on their own.

Simo.

Patch 530: ACK

Patch 531: ACK

Patch 532:

The methods should be static methods:

      @staticmethod
      def setOption(name, value):
      ...

Care to explain why ?
@staticmethod is not used anywhere else in that file.

Rebased patches on master, made requested change +1 more patch.

Simo.


Patch 532: ACK

Patch 533: ACK

Pushed to master: f57b687241fbc92d1138507210e87e9de465c507

Honza


Actually, there is a problem with patch 531: SASL mapping are added only on replica.

The attached patch fixes it.

--
Jan Cholasta
From 75d16dfc519c457eead2126bf53087dc971674c6 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jchol...@redhat.com>
Date: Thu, 27 Aug 2015 10:52:57 +0200
Subject: [PATCH] install: Fix SASL mappings not added in ipa-server-install

---
 ipaserver/install/dsinstance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 8320569..dd67915 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -253,6 +253,7 @@ class DsInstance(service.Service):
         self.step("configure autobind for root", self.__root_autobind)
         self.step("configure new location for managed entries", self.__repoint_managed_entries)
         self.step("configure dirsrv ccache", self.configure_dirsrv_ccache)
+        self.step("adding sasl mappings to the directory", self.__configure_sasl_mappings)
         self.step("enable SASL mapping fallback", self.__enable_sasl_mapping_fallback)
         self.step("restarting directory server", self.__restart_instance)
 
@@ -354,7 +355,6 @@ class DsInstance(service.Service):
         self.__common_setup(True)
 
         self.step("setting up initial replication", self.__setup_replica)
-        self.step("adding sasl mappings to the directory", self.__configure_sasl_mappings)
         self.step("updating schema", self.__update_schema)
         # See LDIFs for automember configuration during replica install
         self.step("setting Auto Member configuration", self.__add_replica_automember_config)
-- 
2.4.3

-- 
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

Reply via email to