masqmail

changeset 319:d41fb3b9ed3e

find changesets by author, revision, files, or words in the commit message
refactoring in the small
author meillo@marmaro.de
date Thu, 28 Apr 2011 16:42:28 +0200
parents 290da1595311
children 4c705c34182f
files src/conf.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line diff
     1.1 --- a/src/conf.c	Thu Apr 28 13:29:26 2011 +0200
     1.2 +++ b/src/conf.c	Thu Apr 28 16:42:28 2011 +0200
     1.3 @@ -773,16 +773,14 @@
     1.4  			logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval);
     1.5  	}
     1.6  
     1.7 -	if (route->resolve_list == NULL) {
     1.8 -		if (is_local_net) {
     1.9 -			route->resolve_list = g_list_append(NULL, resolve_byname);
    1.10 -		} else {
    1.11 +	if (!route->resolve_list) {
    1.12  #ifdef ENABLE_RESOLVER
    1.13 +		if (!is_local_net) {
    1.14  			route->resolve_list = g_list_append(route->resolve_list, resolve_dns_mx);
    1.15  			route->resolve_list = g_list_append(route->resolve_list, resolve_dns_a);
    1.16 +		}
    1.17  #endif
    1.18 -			route->resolve_list = g_list_append(route->resolve_list, resolve_byname);
    1.19 -		}
    1.20 +		route->resolve_list = g_list_append(route->resolve_list, resolve_byname);
    1.21  	}
    1.22  	fclose(in);
    1.23  	ok = TRUE;