diff options
| author | bcyrill <cyrill@bannwart.info> | 2012-07-02 22:20:06 +0200 |
|---|---|---|
| committer | bcyrill <cyrill@bannwart.info> | 2012-07-02 22:20:06 +0200 |
| commit | 36f6ed351af7712b07f2e1d37155d91bc883c893 (patch) | |
| tree | c1bac956558b822fa40617a70d4f9ce3f00c2932 /etc/inc/certs.inc | |
| parent | e0a45ce03c033d40afbcd9a64b16dc686a000465 (diff) | |
| download | pfsense-36f6ed351af7712b07f2e1d37155d91bc883c893.zip pfsense-36f6ed351af7712b07f2e1d37155d91bc883c893.tar.gz | |
Use Certificate Manager in Captive Portal settings
Diffstat (limited to 'etc/inc/certs.inc')
| -rw-r--r-- | etc/inc/certs.inc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/etc/inc/certs.inc b/etc/inc/certs.inc index ec3227d..862e91b 100644 --- a/etc/inc/certs.inc +++ b/etc/inc/certs.inc @@ -528,12 +528,24 @@ function is_webgui_cert($certref) { return true; } +function is_captiveportal_cert($certref) { + global $config; + if (!is_array($config['captiveportal'])) + return; + foreach ($config['captiveportal'] as $portal) { + if ($portal['enable'] && $portal['httpslogin_enable'] && ($portal['certref'] == $certref)) + return true; + } + return false; +} + function cert_in_use($certref) { return (is_webgui_cert($certref) || is_user_cert($certref) || is_openvpn_server_cert($certref) || is_openvpn_client_cert($certref) || - is_ipsec_cert($certref)); + is_ipsec_cert($certref) || + is_captiveportal_cert($certref)); } /* |
