[Freeipa-devel] [PATCH 0066] Log errors from dns_name_concatenate() in zone_refresh() properly

[Adam Tkac]

On Fri, Sep 21, 2012 at 10:13:37AM +0200, Petr Spacek wrote:
> Hello,
> 
> Log errors from dns_name_concatenate() in zone_refresh() properly.

Ack.

> From b8abc442b0d483366f002a8364a333577042d652 Mon Sep 17 00:00:00 2001
> From: Petr Spacek <pspacek at redhat.com>
> Date: Fri, 21 Sep 2012 10:10:55 +0200
> Subject: [PATCH] Log errors from dns_name_concatenate() in zone_refresh()
>  properly.
> 
> Signed-off-by: Petr Spacek <pspacek at redhat.com>
> ---
>  src/ldap_helper.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/src/ldap_helper.c b/src/ldap_helper.c
> index 2245cb982f26eab165a327b4ad72046f9eb4024e..3301f8d872239dcc48506d1f935dacad7bf5990f 100644
> --- a/src/ldap_helper.c
> +++ b/src/ldap_helper.c
> @@ -1312,9 +1312,11 @@ refresh_zones_from_ldap(ldap_instance_t *ldap_inst, isc_boolean_t delete_only)
>  			goto next;
>  		}
>  
> -		if (dns_name_concatenate(&fname, &forig, &aname, aname.buffer)
> -				!= ISC_R_SUCCESS) {
> -			log_error_r("unable to concatenate DNS names during zone_refresh");
> +		result = dns_name_concatenate(&fname, &forig, &aname,
> +					      aname.buffer);
> +		if (result != ISC_R_SUCCESS) {
> +			log_error_r("unable to concatenate DNS names"
> +				    "during zone_refresh");
>  			goto next;	
>  		}
>  
> -- 
> 1.7.11.4
> 


-- 
Adam Tkac, Red Hat, Inc.