[Freeipa-devel] [PATCH 0084] Restore compatibility with BIND 9.8

[Adam Tkac]

On Wed, Oct 31, 2012 at 10:58:10AM +0100, Petr Spacek wrote:
> Hello,
> 
> this patch restores compatibility with BIND 9.8.

Ack

> From f06e5e21025a1187dfe223682e99bfb8c8193be3 Mon Sep 17 00:00:00 2001
> From: Petr Spacek <pspacek at redhat.com>
> Date: Wed, 31 Oct 2012 10:57:01 +0100
> Subject: [PATCH] Restore compatibility with BIND 9.8.
> 
> Signed-off-by: Petr Spacek <pspacek at redhat.com>
> ---
>  NEWS              | 4 ++++
>  src/ldap_helper.c | 7 ++++++-
>  2 files changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/NEWS b/NEWS
> index 714c58b940c8c22eca44d9bd0c6fe3f3156fed53..e0d6abfafc0e62eb48789c66345fe9c77caa5591 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -1,3 +1,7 @@
> +2.2
> +======
> +[1] Compatibility with BIND 9.8 was restored.
> +
>  2.1
>  ======
>  [1] Forward policy "none" was introduced.
> diff --git a/src/ldap_helper.c b/src/ldap_helper.c
> index b7be970202f625dd43422c3d37695fbf9303e27b..5d7138b1861a85ad8f3d8027e94f4f807355f48a 100644
> --- a/src/ldap_helper.c
> +++ b/src/ldap_helper.c
> @@ -1120,8 +1120,13 @@ ldap_parse_zoneentry(ldap_entry_t *entry, ldap_instance_t *inst)
>  	 */
>  	result = configure_zone_forwarders(entry, inst, &name);
>  	if (result != ISC_R_DISABLED) {
> -		if (result == ISC_R_SUCCESS)
> +		if (result == ISC_R_SUCCESS) {
> +#if LIBDNS_VERSION_MAJOR < 90
> +			result = dns_view_flushcache(inst->view);
> +#else
>  			result = dns_view_flushnode(inst->view, &name, ISC_TRUE);
> +#endif
> +		}
>  		/* DO NOT CHANGE ANYTHING ELSE after forwarders are set up! */
>  		goto cleanup;
>  	}
> -- 
> 1.7.11.7
> 


-- 
Adam Tkac, Red Hat, Inc.