diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-04-15 13:38:13 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-04-15 13:38:13 -0300 |
| commit | a51493d1981175048bdccce51f6b4ad6720da679 (patch) | |
| tree | 0c4afae78c022380e5f4cbb9397859761f46d708 /etc/inc/openvpn.inc | |
| parent | f599d893fff3d78f44068dc3ba238046d933ddb1 (diff) | |
| parent | 7b2fdeb3c5d4fecc23ce2f9a7e1fa1a4c3af63be (diff) | |
| download | pfsense-a51493d1981175048bdccce51f6b4ad6720da679.zip pfsense-a51493d1981175048bdccce51f6b4ad6720da679.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/gwlb.inc
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 96ea1f9..17769bf 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -382,13 +382,13 @@ function openvpn_reconfigure($mode, $settings) { // configure p2p/server modes switch($settings['mode']) { - case 'p2p_tls': case 'p2p_shared_key': $baselong = ip2long32($ip) & ip2long($mask); $ip1 = long2ip32($baselong + 1); $ip2 = long2ip32($baselong + 2); $conf .= "ifconfig $ip1 $ip2\n"; break; + case 'p2p_tls': case 'server_tls': case 'server_user': case 'server_tls_user': |
