diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-28 08:41:24 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-28 08:41:24 -0300 |
| commit | 9e1bc7c03db0ab96df5ad65ccee17511c4ed1fcf (patch) | |
| tree | 36e7138d2c9ea90e53abc37f691a154fa72fa490 | |
| parent | d5bb311045aa655d04f22d032695f7bebccdd8f7 (diff) | |
| parent | 7d53fbfbaa0c35aebf854b21abbc4a841d65372c (diff) | |
| download | pfsense-packages-9e1bc7c03db0ab96df5ad65ccee17511c4ed1fcf.tar.gz pfsense-packages-9e1bc7c03db0ab96df5ad65ccee17511c4ed1fcf.tar.bz2 pfsense-packages-9e1bc7c03db0ab96df5ad65ccee17511c4ed1fcf.zip | |
Merge pull request #979 from PiBa-NL/snort-3.2.6
| -rwxr-xr-x | config/snort/snort.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/snort/snort.inc b/config/snort/snort.inc index fb8cd9d8..7b068f01 100755 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -3757,8 +3757,8 @@ function snort_sync_on_changes() { } break; case "auto": - if (is_array($config['installedpackages']['carpsettings']) && is_array($config['installedpackages']['carpsettings']['config'])){ - $system_carp=$config['installedpackages']['carpsettings']['config'][0]; + if (is_array($config['hasync'])) { + $system_carp=$config['hasync']; $rs[0]['varsyncipaddress']=$system_carp['synchronizetoip']; $rs[0]['varsyncusername']=$system_carp['username']; $rs[0]['varsyncpassword']=$system_carp['password']; diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 1b5d6d58..4b02bcdd 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -472,7 +472,7 @@ </build_pbi> <build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET=PERFPROFILE SOURCEFIRE GRE IPV6 NORMALIZER APPID;snort_UNSET=PULLEDPORK FILEINSPECT HA;perl_SET=THREADS</build_options> <config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file> - <version>2.9.7.2 pkg v3.2.4</version> + <version>2.9.7.2 pkg v3.2.5</version> <required_version>2.1</required_version> <status>Stable</status> <configurationfile>/snort.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 026b18fe..e93af0be 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -459,7 +459,7 @@ </build_pbi> <build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET=PERFPROFILE SOURCEFIRE GRE IPV6 NORMALIZER APPID;snort_UNSET=PULLEDPORK FILEINSPECT HA;perl_SET=THREADS</build_options> <config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file> - <version>2.9.7.2 pkg v3.2.4</version> + <version>2.9.7.2 pkg v3.2.5</version> <required_version>2.1</required_version> <status>Stable</status> <configurationfile>/snort.xml</configurationfile> |