summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/system_camanager.php
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2016-08-03 10:47:13 -0400
committerjim-p <jimp@pfsense.org>2016-08-03 10:48:13 -0400
commitda0f70ed65b2f0f7d8831d3743c3d0f3e6aac382 (patch)
tree28bf5d6c5741683b46c3b35e4486454358ed3d58 /src/usr/local/www/system_camanager.php
parent00dc6b2ab06549c63ba974b30cefd7660add0819 (diff)
downloadpfsense-da0f70ed65b2f0f7d8831d3743c3d0f3e6aac382.zip
pfsense-da0f70ed65b2f0f7d8831d3743c3d0f3e6aac382.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_camanager.php')
-rw-r--r--src/usr/local/www/system_camanager.php17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php
index 1015e5d..d9112b1 100644
--- a/src/usr/local/www/system_camanager.php
+++ b/src/usr/local/www/system_camanager.php
@@ -269,6 +269,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 (!ca_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn, $pconfig['digest_alg'])) {
while ($ssl_err = openssl_error_string()) {
$input_errors = array();
@@ -283,7 +286,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 (!ca_inter_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn, $pconfig['caref'], $pconfig['digest_alg'])) {
while ($ssl_err = openssl_error_string()) {
$input_errors = array();
@@ -568,7 +573,15 @@ $section->addInput(new Form_Input(
'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(
OpenPOWER on IntegriCloud