diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-11-01 15:39:36 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-11-01 15:39:58 -0200 |
| commit | c030cf2781c7bbef197db6f07facef35b6856c8e (patch) | |
| tree | c5e787ae332e4cf258e76242e523f32c8ad0f51d | |
| parent | 5e20654577393326d9a7b87fff9f76ba3677a32b (diff) | |
| download | pfsense-packages-c030cf2781c7bbef197db6f07facef35b6856c8e.tar.gz pfsense-packages-c030cf2781c7bbef197db6f07facef35b6856c8e.tar.bz2 pfsense-packages-c030cf2781c7bbef197db6f07facef35b6856c8e.zip | |
Restrict regex to only consider files to rotate, and ignore other params like key_file and cert_file. Fixes #3292
| -rw-r--r-- | config/syslog-ng/syslog-ng.inc | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config/syslog-ng/syslog-ng.inc b/config/syslog-ng/syslog-ng.inc index 75d5bb4d..e1b4d35e 100644 --- a/config/syslog-ng/syslog-ng.inc +++ b/config/syslog-ng/syslog-ng.inc @@ -235,7 +235,7 @@ function syslogng_get_log_files($objects) { foreach($objects as $object) { if($object['objecttype'] == 'destination') { - preg_match("/file\(['\"]([^'\"]*)['\"]/", base64_decode($object['objectparameters']), $match); + preg_match("/\bfile\b\(['\"]([^'\"]*)['\"]/", base64_decode($object['objectparameters']), $match); if($match) { $log_file = $match[1]; array_push($log_files, $log_file); @@ -433,4 +433,4 @@ EOD; conf_mount_rw(); write_rcfile($rc); } -?>
\ No newline at end of file +?> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 430d5634..4837ef52 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1887,7 +1887,7 @@ <website>http://www.balabit.com/network-security/syslog-ng/</website> <descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr> <category>Services</category> - <version>3.3.6_2</version> + <version>3.3.6_3</version> <status>ALPHA</status> <required_version>2.1</required_version> <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 3cb49a6d..50f4c228 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1874,7 +1874,7 @@ <website>http://www.balabit.com/network-security/syslog-ng/</website> <descr>Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.</descr> <category>Services</category> - <version>3.3.6_2</version> + <version>3.3.6_3</version> <status>ALPHA</status> <required_version>2.1</required_version> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> |