On 28.5.2013 15:55, Petr Spacek wrote:
Hello,
Deprecate configuration without persistent search.
https://fedorahosted.org/bind-dyndb-ldap/ticket/120
This version of the patch adds notice to the README.
--
Petr^2 Spacek
From 7b685ff7077d10c1917c5a9a97b50d77587b8f04 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspa...@redhat.com>
Date: Tue, 28 May 2013 15:54:24 +0200
Subject: [PATCH] Deprecate configuration without persistent search.
https://fedorahosted.org/bind-dyndb-ldap/ticket/120
Signed-off-by: Petr Spacek <pspa...@redhat.com>
---
README | 4 +++-
src/ldap_helper.c | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/README b/README
index e25108aea464d0568098f58946ecefca5bed6c41..2b4926e3356956198f2b3b75f1f5b682f981d8d1 100644
--- a/README
+++ b/README
@@ -198,12 +198,13 @@ cache_ttl (default 120)
probably want to set this option on a higher value.
zone_refresh (default 0)
+ ! This option is DEPRECATED and will be removed in the future. !
Interval (in seconds) of how often the LDAP driver should query the
LDAP server for changes in zone settings. If this option is set to 0,
the LDAP driver will never refresh the settings.
Currently, global settings in idnsConfigObject and zone specific
settings in idnsZone attributes are refreshed.
- Value is ignored if persistent search (psearch) is enabled.
+ Zone refresh and persistent search (psearch) are mutually exclusive.
timeout (default 10)
Timeout (in seconds) of the queries to the LDAP server. If the LDAP
@@ -217,6 +218,7 @@ fake_mname (default "")
SOA record, for example.
psearch (default no)
+ ! Persistent search will be mandatory in future releases. !
Set this option to "yes" if you would like to use persistent search
query for zone records and global settings. When server supports
persistent search your zones and configuration will be automatically
diff --git a/src/ldap_helper.c b/src/ldap_helper.c
index 0de62025e67d466a5c656ce8a5d6b3042fadce67..424bc4b8afef924e92524ceca620e047380d70a4 100644
--- a/src/ldap_helper.c
+++ b/src/ldap_helper.c
@@ -386,6 +386,10 @@ validate_local_instance_settings(ldap_instance_t *inst, settings_set_t *set) {
/* watcher needs one and update_*() requests second connection */
CLEANUP_WITH(ISC_R_RANGE);
}
+ if (!psearch)
+ log_info("configuration without persistent search is deprecated "
+ "and the support for zone_refresh will be removed "
+ "in the future");
CHECK(setting_get_bool("serial_autoincrement", set, &serial_autoincrement));
if (serial_autoincrement && !psearch) {
--
1.7.11.7
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
