From: Wouter Wijngaards Date: Fri, 10 Apr 2015 13:43:44 +0000 (+0000) Subject: - Fix that get_option for cache-sizes does not print double newline. X-Git-Tag: release-1.5.4~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55412b26455dcdeae3668f5c126020ca7502ef8c;p=thirdparty%2Funbound.git - Fix that get_option for cache-sizes does not print double newline. git-svn-id: file:///svn/unbound/trunk@3395 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 82182e513..295d160dc 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -3,6 +3,7 @@ - ratelimit feature, ratelimit: 100, or some sensible qps, can be used to turn it on. It ratelimits recursion effort per zone. For particular names you can configure exceptions in unbound.conf. + - Fix that get_option for cache-sizes does not print double newline. 8 April 2015: Wouter - Fix crash in dnstap: Do not try to log TCP responses after timeout. diff --git a/util/config_file.c b/util/config_file.c index b402f0ef6..af06ed7f5 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -595,8 +595,8 @@ config_collate_cat(struct config_strlist* list) #define O_MEM(opt, str, var) if(strcmp(opt, str)==0) { \ if(cfg->var > 1024*1024*1024) { \ size_t f=cfg->var/(size_t)1000000, b=cfg->var%(size_t)1000000; \ - snprintf(buf, len, "%u%6.6u\n", (unsigned)f, (unsigned)b); \ - } else snprintf(buf, len, "%u\n", (unsigned)cfg->var); \ + snprintf(buf, len, "%u%6.6u", (unsigned)f, (unsigned)b); \ + } else snprintf(buf, len, "%u", (unsigned)cfg->var); \ func(buf, arg);} /** compare and print list option */ #define O_LST(opt, name, lst) if(strcmp(opt, name)==0) { \