From c4ab8dae35e952ae74e49c5ad0fbfbc0718f60f8 Mon Sep 17 00:00:00 2001
From: Martin Kosek <mkosek@redhat.com>
Date: Mar 14 2013 14:50:24 +0000
Subject: Do not force named connections on upgrades


We used to set connections argument for bind-dyndb-ldap even when
the attribute was not in named.conf. This is not necessary as
the bind-dyndb-ldap plugin chooses a sane default instead of us.

---

diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index f310ff7..f565213 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -383,7 +383,7 @@ def named_enable_psearch():
         # "connections" option, bail out
         pass
     else:
-        if connections is None or connections < minimum_connections:
+        if connections is not None and connections < minimum_connections:
             try:
                 bindinstance.named_conf_set_directive('connections',
                                                         minimum_connections)