diff options
| author | jim-p <jimp@pfsense.org> | 2010-11-02 15:14:11 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-11-02 15:14:11 -0400 |
| commit | a6607b5fe0b480074b458480722326368f51c125 (patch) | |
| tree | cbd4b24c8252c6edc2cd7c6cfc925f65e7387a13 /etc/inc/vpn.inc | |
| parent | f856e762704c09e8508ec237ad12b7ba3825aa0c (diff) | |
| download | pfsense-a6607b5fe0b480074b458480722326368f51c125.zip pfsense-a6607b5fe0b480074b458480722326368f51c125.tar.gz | |
More VPN log fixes, for consistency. Ticket #912
Diffstat (limited to 'etc/inc/vpn.inc')
| -rw-r--r-- | etc/inc/vpn.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 642476b..4e8f4ca 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -996,7 +996,7 @@ function vpn_pptpd_configure() { } $mpdconf = <<<EOD -pptpd: +pptps: EOD; @@ -1144,7 +1144,7 @@ EOD; chmod("{$g['varetc_path']}/pptp-vpn/mpd.secret", 0600); /* fire up mpd */ - mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pptp-vpn -p {$g['varrun_path']}/pptp-vpn.pid -s pptp -f mpd.conf pptpd"); + mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pptp-vpn -p {$g['varrun_path']}/pptp-vpn.pid -s pptps pptps"); break; @@ -1208,7 +1208,7 @@ function vpn_pppoe_configure(&$pppoecfg) { return 1; } $mpdconf = "\n\n"; - $mpdconf .= "pppoe:\n"; + $mpdconf .= "poes:\n"; for ($i = 0; $i < $pppoecfg['n_pppoe_units']; $i++) { $mpdconf .= " load poes{$pppoecfg['pppoeid']}{$i}\n"; @@ -1347,7 +1347,7 @@ EOD; } /* fire up mpd */ - mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pppoe{$pppoecfg['pppoeid']}-vpn -p {$g['varrun_path']}/pppoe{$pppoecfg['pppoeid']}-vpn.pid -s pppoe pppoe"); + mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pppoe{$pppoecfg['pppoeid']}-vpn -p {$g['varrun_path']}/pppoe{$pppoecfg['pppoeid']}-vpn.pid -s poes poes"); break; } @@ -1402,7 +1402,7 @@ function vpn_l2tp_configure() { } $mpdconf = "\n\n"; $mpdconf .=<<<EOD -l2tp: +l2tps: EOD; @@ -1528,7 +1528,7 @@ EOD; chmod("{$g['varetc_path']}/l2tp-vpn/mpd.secret", 0600); /* fire up mpd */ - mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/l2tp-vpn -p {$g['varrun_path']}/l2tp-vpn.pid -s l2tp l2tp"); + mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/l2tp-vpn -p {$g['varrun_path']}/l2tp-vpn.pid -s l2tps l2tps"); break; |
