diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-04-18 19:25:13 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-04-18 19:25:13 -0400 |
commit | be248524cc6febab7ed7159f29763bd1cb172ce8 (patch) | |
tree | e426b1827551016c542950fc539dd25cd22792a5 /etc | |
parent | af990fa245b2fe24acb43a80ca19081bd0974cdb (diff) | |
download | pfsense-be248524cc6febab7ed7159f29763bd1cb172ce8.zip pfsense-be248524cc6febab7ed7159f29763bd1cb172ce8.tar.gz |
Match 1.X behavior for PF macros for PPPoE and PPTP
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/filter.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 3ff6c95..5a2fa7f 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -423,7 +423,7 @@ function generate_optcfg_array() if ($config['pptpd']['mode'] == "server" || $config['pptpd']['mode'] == "redir") { $oic = array(); $oic['if'] = 'pptp'; - $oic['descr'] = 'PPTP'; + $oic['descr'] = 'pptp'; $oic['ip'] = $config['pptpd']['localip']; $oic['sa'] = $config['pptpd']['remoteip']; $oic['mode'] = $config['pptpd']['mode']; @@ -435,23 +435,23 @@ function generate_optcfg_array() $FilterIflist['pptp'] = $oic; } if ($config['l2tp']['mode'] == "server") { - $oic = array(); - $oic['if'] = 'l2tp'; - $oic['descr'] = 'L2TP'; - $oic['ip'] = $config['l2tp']['localip']; - $oic['sa'] = $config['l2tp']['remoteip']; + $oic = array(); + $oic['if'] = 'l2tp'; + $oic['descr'] = 'L2TP'; + $oic['ip'] = $config['l2tp']['localip']; + $oic['sa'] = $config['l2tp']['remoteip']; if ($config['l2tp']['l2tp_subnet'] <> "") $oic['sn'] = $config['l2tp']['l2tp_subnet']; else $oic['sn'] = "32"; $oic['mode'] = $config['l2tp']['mode']; - $oic['virtual'] = true; - $FilterIflist['l2tp'] = $oic; + $oic['virtual'] = true; + $FilterIflist['l2tp'] = $oic; } if ($config['pppoe']['mode'] == "server") { $oic = array(); $oic['if'] = 'pppoe'; - $oic['descr'] = 'PPPoE'; + $oic['descr'] = 'pppoe'; $oic['ip'] = $config['pppoe']['localip']; $oic['sa'] = $config['pppoe']['remoteip']; $oic['mode'] = $config['pppoe']['mode']; |