diff options
| author | Alexander Wilke <nachtfalkeaw[@]web.de> | 2012-01-28 22:54:56 +0100 |
|---|---|---|
| committer | Alexander Wilke <nachtfalkeaw[@]web.de> | 2012-01-28 22:54:56 +0100 |
| commit | aede6d56470fb4ec1af2d47da075bdfcc1d8528d (patch) | |
| tree | b514ba8953b14d3a496e736b2b17461f6bcda1ec | |
| parent | b128136ee06d2acf7df376acf0f539d81b2b35d5 (diff) | |
| download | pfsense-packages-aede6d56470fb4ec1af2d47da075bdfcc1d8528d.tar.gz pfsense-packages-aede6d56470fb4ec1af2d47da075bdfcc1d8528d.tar.bz2 pfsense-packages-aede6d56470fb4ec1af2d47da075bdfcc1d8528d.zip | |
fix check_cert_issuer
| -rw-r--r-- | config/freeradius2/freeradius.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc index 4e4792a0..fb7945b9 100644 --- a/config/freeradius2/freeradius.inc +++ b/config/freeradius2/freeradius.inc @@ -766,6 +766,8 @@ function freeradius_eapconf_resync() { $vareapconfstate = ($eapconf['vareapconfstate']?$eapconf['vareapconfstate']:'Texas'); $vareapconfcity = ($eapconf['vareapconfcity']?$eapconf['vareapconfcity']:'Austin'); $vareapconforganization = ($eapconf['vareapconforganization']?$eapconf['vareapconforganization']:'My Company Ltd'); + $vareapconfemail = ($eapconf['vareapconfemail']?$eapconf['vareapconfemail']:'admin@mycompany.com'); + $vareapconfcommonname = ($eapconf['vareapconfcommonname']?$eapconf['vareapconfcommonname']:'internal-ca'); // Variables: Cache $vareapconfcacheenablecache = ($eapconf['vareapconfcacheenablecache']?$eapconf['vareapconfcacheenablecache']:'no'); @@ -891,10 +893,10 @@ else { // check if cert issuer of CA and certs match if($eapconf['vareapconfenablecheckcertissuer'] == 'on') { - $vareapconfcheckcertissuer = "check_cert_issuer = " . '"' . "/C=$vareapconfcountry/ST=$vareapconfstate/L=$vareapconfcity/O=$vareapconforganization" . '"'; + $vareapconfcheckcertissuer = "check_cert_issuer = " . '"' . "/C=$vareapconfcountry/ST=$vareapconfstate/L=$vareapconfcity/O=$vareapconforganization/emailAddress=$vareapconfemail/CN=$vareapconfcommonname" . '"'; } else { - $vareapconfcheckcertissuer = '### check_cert_issuer = "/C=GB/ST=Berkshire/L=Newbury/O=My Company Ltd" ###'; + $vareapconfcheckcertissuer = '### check_cert_issuer = "/C=GB/ST=Berkshire/L=Newbury/O=My Company Ltd/emailAddress=test@mycomp.com/CN=myca" ###'; } $conf .= <<<EOD |