From 57fbbeb0845b02da6ccc4e50f3e3bed57cac4b53 Mon Sep 17 00:00:00 2001
From: jdeluyck <5451787+jdeluyck@users.noreply.github.com>
Date: Tue, 25 May 2021 20:47:33 +0200
Subject: [PATCH] also fix dn_organization

---
 src/www/system_camanager.php   | 6 +++---
 src/www/system_certmanager.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/www/system_camanager.php b/src/www/system_camanager.php
index f8a2ecd8b..8f4812d6a 100644
--- a/src/www/system_camanager.php
+++ b/src/www/system_camanager.php
@@ -321,11 +321,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                     if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $pconfig["dn_commonname"])) {
                         $input_errors[] = gettext("The field 'Distinguished name Common Name' contains invalid characters.");
                     }
-                } elseif ($reqdfields[$i] == "csr_dn_organization") {
-                    if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\"\']/", $pconfig["csr_dn_organization"])) {
+                } elseif ($reqdfields[$i] == "dn_organization") {
+                    if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\"\']/", $pconfig["dn_organization"])) {
                         $input_errors[] = gettext("The field 'Distinguished name Organization' contains invalid characters.");
                     }
-                } elseif (($reqdfields[$i] != "descr") && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $pconfig["$reqdfields[$i]"])) {
+                } elseif (($reqdfields[$i] != "descr" && $reqdfields[$i] != "dn_organization") && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $pconfig["$reqdfields[$i]"])) {
                     $input_errors[] = sprintf(gettext("The field '%s' contains invalid characters."), $reqdfieldsn[$i]);
                 }
             }
diff --git a/src/www/system_certmanager.php b/src/www/system_certmanager.php
index 8f44852d5..e5ade4244 100644
--- a/src/www/system_certmanager.php
+++ b/src/www/system_certmanager.php
@@ -577,9 +577,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                     if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $pconfig[$reqdfields[$i]])) {
                         $input_errors[] = gettext("The field 'Distinguished name Common Name' contains invalid characters.");
                     }
-                } elseif ($reqdfields[$i] == "csr_dn_organization") {
-                    if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\"\']/", $pconfig["csr_dn_organization"])) {
-                        $input_errors[] = gettext("The field 'Distinguished name Organization' contains invalid characters.");
+                } elseif ($reqdfields[$i] == "csr_dn_organization" || $reqdfields[$i] == "dn_organization") {
+                    if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\"\']/", $pconfig[$reqdfields[$i]])) {
+                        $input_errors[] = sprintf(gettext("The field '%s' contains invalid characters."), $reqdfieldsn[$i]);
                     }
                 } elseif (($reqdfields[$i] != "descr" && $reqdfields[$i] != "csr" && $reqdfields[$i] != "csr_dn_organization") && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $pconfig[$reqdfields[$i]])) {
                     $input_errors[] = sprintf(gettext("The field '%s' contains invalid characters."), $reqdfieldsn[$i]);