summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2013-03-13 10:55:48 +0100
committerRob Crittenden <rcritten@redhat.com>2013-03-14 10:50:24 -0400
commitc4ab8dae35e952ae74e49c5ad0fbfbc0718f60f8 (patch)
tree50472fbebc77b6d6942456730b95e3a6c68e65ba
parent7a2d3804af8e477cf8bfcc36eed78b72c8d8c980 (diff)
downloadfreeipa-c4ab8dae35e952ae74e49c5ad0fbfbc0718f60f8.tar.gz
freeipa-c4ab8dae35e952ae74e49c5ad0fbfbc0718f60f8.tar.xz
freeipa-c4ab8dae35e952ae74e49c5ad0fbfbc0718f60f8.zip
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.
-rw-r--r--install/tools/ipa-upgradeconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index f310ff76d..f5652139d 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)