From c63ae216e609396cfbfb99e15837b0db5bcbed6d Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 6 Sep 2019 10:30:22 -0400 Subject: [PATCH] Fix rotation count check. Issue #9711 While here, fixup default static newsyslog entries. Issue #8350 --- src/etc/inc/syslog.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/etc/inc/syslog.inc b/src/etc/inc/syslog.inc index 4599148508..8aa2c736bb 100644 --- a/src/etc/inc/syslog.inc +++ b/src/etc/inc/syslog.inc @@ -475,7 +475,7 @@ EOD; $log_size = ($log_size < (2**32)/2) ? $log_size : "511488"; $log_size = (int)$log_size/1024; - $rotatecount = isset($syslogcfg['rotatecount']) ? $syslogcfg['rotatecount'] : 7; + $rotatecount = is_numericint($syslogcfg['rotatecount']) ? $syslogcfg['rotatecount'] : 7; $compression_flag = $system_log_compression_types[system_log_get_compression()]['flag']; @@ -483,9 +483,8 @@ EOD; if (isset($syslogcfg)) { $separatelogfacilities = array('ntp', 'ntpd', 'ntpdate', 'charon', 'ipsec_starter', 'openvpn', 'poes', 'l2tps', 'hostapd', 'dnsmasq', 'named', 'filterdns', 'unbound', 'dhcpd', 'dhcrelay', 'dhclient', 'dhcp6c', 'dpinger', 'radvd', 'routed', 'zebra', 'ospfd', 'ospf6d', 'bgpd', 'miniupnpd', 'filterlog'); $newsyslogconf = <<