[Freeipa-devel] [PATCH 0068] Fix "unable to concatenate DNS names during zone_refresh" error

[Adam Tkac]

On Mon, Sep 24, 2012 at 01:22:32PM +0200, Petr Spacek wrote:
> Hello,
> 
>     Fix "unable to concatenate DNS names during zone_refresh" error.
> 
>     This fixes zone refresh for cases where concatenation of all
>     zone names is longer than 255 characters.

Ack

> From e9764d49e8c3ecd6985cd35d7ef1991ee569a98a Mon Sep 17 00:00:00 2001
> From: Petr Spacek <pspacek at redhat.com>
> Date: Mon, 24 Sep 2012 10:39:49 +0200
> Subject: [PATCH] Fix "unable to concatenate DNS names during zone_refresh"
>  error.
> 
> This fixes zone refresh for cases where concatenation of all
> zone names is longer than 255 characters.
> 
> Signed-off-by: Petr Spacek <pspacek at redhat.com>
> ---
>  src/ldap_helper.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/ldap_helper.c b/src/ldap_helper.c
> index cbb818e7a7510155804a40bc242d7245b1faea90..373d57ac385d4db7394959c23c511e1734503989 100644
> --- a/src/ldap_helper.c
> +++ b/src/ldap_helper.c
> @@ -1300,10 +1300,10 @@ refresh_zones_from_ldap(ldap_instance_t *ldap_inst, isc_boolean_t delete_only)
>  	result = dns_rbtnodechain_first(&chain, zr_get_rbt(ldap_inst->zone_register), NULL, NULL);
>  	
>  	while (result == DNS_R_NEWORIGIN || result == ISC_R_SUCCESS) {
> -		
> +		dns_name_reset(&aname);
>  		delete = ISC_FALSE;	
>  		node = NULL;
> -		
> +
>  		result = dns_rbtnodechain_current(&chain, &fname, &forig, &node);
>  		if (result != ISC_R_SUCCESS) {
>  			if (result != ISC_R_NOTFOUND)
> @@ -1315,7 +1315,7 @@ refresh_zones_from_ldap(ldap_instance_t *ldap_inst, isc_boolean_t delete_only)
>  		result = dns_name_concatenate(&fname, &forig, &aname,
>  					      aname.buffer);
>  		if (result != ISC_R_SUCCESS) {
> -			log_error_r("unable to concatenate DNS names"
> +			log_error_r("unable to concatenate DNS names "
>  				    "during zone_refresh");
>  			goto next;	
>  		}
> -- 
> 1.7.11.4
> 


-- 
Adam Tkac, Red Hat, Inc.