diff options
author | jim-p <jimp@pfsense.org> | 2016-08-03 10:47:13 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2016-08-03 10:48:51 -0400 |
commit | b8332debca8d8334fb51ed17638df7343c738e59 (patch) | |
tree | 0b51f2fb5e92e03c11596f426269740aca79f454 /src/usr/local/www/system_certmanager.php | |
parent | 4e5477eace9aa5f00c53ff62ca3e35e38177bb09 (diff) | |
download | pfsense-b8332debca8d8334fb51ed17638df7343c738e59.zip pfsense-b8332debca8d8334fb51ed17638df7343c738e59.tar.gz |
Add a field to CA/Cert pages for OU, which is required by some external CAs and users. Fixes #6672
Diffstat (limited to 'src/usr/local/www/system_certmanager.php')
-rw-r--r-- | src/usr/local/www/system_certmanager.php | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 08e8b88..6560c57 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -423,7 +423,9 @@ if ($_POST) { 'organizationName' => $pconfig['dn_organization'], 'emailAddress' => $pconfig['dn_email'], 'commonName' => $pconfig['dn_commonname']); - + if (!empty($pconfig['dn_organizationalunit'])) { + $dn['organizationalUnitName'] = $pconfig['dn_organizationalunit']; + } if (count($altnames)) { $altnames_tmp = ""; foreach ($altnames as $altname) { @@ -449,6 +451,9 @@ if ($_POST) { 'organizationName' => $pconfig['csr_dn_organization'], 'emailAddress' => $pconfig['csr_dn_email'], 'commonName' => $pconfig['csr_dn_commonname']); + if (!empty($pconfig['csr_dn_organizationalunit'])) { + $dn['organizationalUnitName'] = $pconfig['csr_dn_organizationalunit']; + } if (count($altnames)) { $altnames_tmp = ""; foreach ($altnames as $altname) { @@ -718,7 +723,15 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { 'Organization', 'text', $pconfig['dn_organization'], - ['placeholder' => 'e.g. My Company Inc.'] + ['placeholder' => 'e.g. My Company Inc'] + )); + + $section->addInput(new Form_Input( + 'dn_organizationalunit', + 'Organizational Unit', + 'text', + $pconfig['dn_organizationalunit'], + ['placeholder' => 'e.g. My Department Name (optional)'] )); $section->addInput(new Form_Input( @@ -837,7 +850,15 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { 'Organization', 'text', $pconfig['csr_dn_organization'], - ['placeholder' => 'e.g. My Company Inc.'] + ['placeholder' => 'e.g. My Company Inc'] + )); + + $section->addInput(new Form_Input( + 'csr_dn_organizationalunit', + 'Organizational Unit', + 'text', + $pconfig['csr_dn_organizationalunit'], + ['placeholder' => 'e.g. My Department Name (optional)'] )); $section->addInput(new Form_Input( @@ -1125,6 +1146,7 @@ events.push(function() { $('#dn_city').val("<?=$subject[2]['v'];?>"); $('#dn_organization').val("<?=$subject[3]['v'];?>"); $('#dn_email').val("<?=$subject[4]['v'];?>"); + $('#dn_organizationalunit').val("<?=$subject[6]['v'];?>"); break; <?php endforeach; |