diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-05-23 15:41:26 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-05-23 15:41:26 -0300 |
| commit | d21d6e2090c6701041b8555cdaca9ad2c949d4f1 (patch) | |
| tree | af0245350bcbb585909b9740c1ac51d3cb07aa80 /etc/inc/openvpn.inc | |
| parent | a51493d1981175048bdccce51f6b4ad6720da679 (diff) | |
| parent | 042578fd634f8c54a158417527d018e0f8f56b95 (diff) | |
| download | pfsense-d21d6e2090c6701041b8555cdaca9ad2c949d4f1.zip pfsense-d21d6e2090c6701041b8555cdaca9ad2c949d4f1.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/interfaces.inc
etc/inc/upgrade_config.inc
etc/inc/vpn.inc
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 17769bf..4ba2f3f 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -382,13 +382,15 @@ function openvpn_reconfigure($mode, $settings) { // configure p2p/server modes switch($settings['mode']) { + case 'p2p_tls': + $conf .= "server {$ip} {$mask}\n"; + $conf .= "client-config-dir {$g['varetc_path']}/openvpn-csc\n"; 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': @@ -951,6 +953,7 @@ function openvpn_refresh_crls() { case 'server_user': if (!empty($settings['crlref'])) { $crl = lookup_crl($settings['crlref']); + crl_update($crl); $fpath = $g['varetc_path']."/openvpn/server{$settings['vpnid']}.crl-verify"; file_put_contents($fpath, base64_decode($crl['text'])); @chmod($fpath, 0644); |
