diff options
author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-10 10:18:21 -0600 |
---|---|---|
committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-10 10:20:07 -0600 |
commit | 179ab6b36448e8bb06a639c303512905c93eb7e5 (patch) | |
tree | 5572c519232cdabe6be012904a655c3cad46b269 /src/etc/inc | |
parent | 94d494fbc0da7d85b0ef8f04dcd2bd4ab0e0a7c7 (diff) | |
download | pfsense-179ab6b36448e8bb06a639c303512905c93eb7e5.zip pfsense-179ab6b36448e8bb06a639c303512905c93eb7e5.tar.gz |
Eliminate a few more cases of $config['ipsec']['enable'].
Mostly when dealing with enc0 interface.
Diffstat (limited to 'src/etc/inc')
-rw-r--r-- | src/etc/inc/easyrule.inc | 3 | ||||
-rw-r--r-- | src/etc/inc/filter.inc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/etc/inc/easyrule.inc b/src/etc/inc/easyrule.inc index dbb8cfc..3c53e92 100644 --- a/src/etc/inc/easyrule.inc +++ b/src/etc/inc/easyrule.inc @@ -52,9 +52,8 @@ function easyrule_find_rule_interface($int) { } /* add ipsec interfaces */ - if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) { + if (ipsec_enabled()) $iflist["enc0"] = "IPSEC"; - } if (isset($iflist[$int])) { return $int; diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index d1ce9b5..36ab337 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -1171,7 +1171,7 @@ function filter_generate_optcfg_array() { } } /* add ipsec interfaces */ - if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) { + if (ipsec_enabled()) { $oic = array(); $oic['if'] = 'enc0'; $oic['descr'] = 'IPsec'; |