From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 5 Aug 2022 08:48:24 +0000 (+0200)
Subject: Fix org#2656 About incorrect error message on TLS CA Certificate
X-Git-Tag: Release-13.0.1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d13399555733f9255b32592cbc3bab14386d8e2;p=thirdparty%2Fbacula.git

Fix org#2656 About incorrect error message on TLS CA Certificate
---

diff --git a/bacula/src/console/bbconsjson.c b/bacula/src/console/bbconsjson.c
index ba3df87ec..0aadaa16a 100644
--- a/bacula/src/console/bbconsjson.c
+++ b/bacula/src/console/bbconsjson.c
@@ -458,7 +458,7 @@ static int check_resources()
       tls_needed = director->tls_enable || director->tls_authenticate;
 
       if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && tls_needed) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in %s."
                              " At least one CA certificate store is required.\n"),
                              director->hdr.name, configfile);
@@ -487,7 +487,7 @@ static int check_resources()
       }
       tls_needed = cons->tls_enable || cons->tls_authenticate;
       if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) && tls_needed) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Console \"%s\" in %s.\n"),
                              cons->hdr.name, configfile);
          OK = false;
diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 7b472b2c8..b053d7df3 100644
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -1495,7 +1495,7 @@ static int check_resources()
       tls_needed = director->tls_enable || director->tls_authenticate;
 
       if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && tls_needed) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in %s."
                              " At least one CA certificate store is required.\n"),
                              director->hdr.name, configfile);
@@ -1529,7 +1529,7 @@ static int check_resources()
       }
       tls_needed = cons->tls_enable || cons->tls_authenticate;
       if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) && tls_needed) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Console \"%s\" in %s.\n"),
                              cons->hdr.name, configfile);
          OK = false;
diff --git a/bacula/src/dird/bdirjson.c b/bacula/src/dird/bdirjson.c
index 9ae80542c..c7dce43f8 100644
--- a/bacula/src/dird/bdirjson.c
+++ b/bacula/src/dird/bdirjson.c
@@ -1226,7 +1226,7 @@ static bool check_resources(bool apply_jobdefs)
 
       if ((!director->tls_ca_certfile && !director->tls_ca_certdir) &&
            need_tls && director->tls_verify_peer) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\" or \"TLS CA"
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\" or \"TLS CA"
               " Certificate Dir\" are defined for Director \"%s\" in %s."
               " At least one CA certificate store is required"
               " when using \"TLS Verify Peer\".\n"),
@@ -1267,7 +1267,7 @@ static bool check_resources(bool apply_jobdefs)
 
       if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir)
             && need_tls && cons->tls_verify_peer) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\" or \"TLS CA"
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\" or \"TLS CA"
             " Certificate Dir\" are defined for Console \"%s\" in %s."
             " At least one CA certificate store is required"
             " when using \"TLS Verify Peer\".\n"),
@@ -1313,7 +1313,7 @@ static bool check_resources(bool apply_jobdefs)
       }
       need_tls = client->tls_enable || client->tls_authenticate;
       if ((!client->tls_ca_certfile && !client->tls_ca_certdir) && need_tls) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
             " or \"TLS CA Certificate Dir\" are defined for File daemon \"%s\" in %s.\n"),
             client->name(), configfile);
          OK = false;
diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 338a4c6a4..0ec020e74 100644
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -966,7 +966,7 @@ static bool check_resources()
 
       if ((!newDirector->tls_ca_certfile && !newDirector->tls_ca_certdir) &&
            need_tls && newDirector->tls_verify_peer) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\" or \"TLS CA"
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\" or \"TLS CA"
               " Certificate Dir\" are defined for Director \"%s\" in %s."
               " At least one CA certificate store is required"
               " when using \"TLS Verify Peer\".\n"),
@@ -1199,7 +1199,7 @@ static bool check_resources()
 
       if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir)
             && need_tls && cons->tls_verify_peer) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\" or \"TLS CA"
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\" or \"TLS CA"
             " Certificate Dir\" are defined for Console \"%s\" in %s."
             " At least one CA certificate store is required"
             " when using \"TLS Verify Peer\".\n"),
@@ -1256,7 +1256,7 @@ static bool check_resources()
       }
       need_tls = client->tls_enable || client->tls_authenticate;
       if ((!client->tls_ca_certfile && !client->tls_ca_certdir) && need_tls) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
             " or \"TLS CA Certificate Dir\" are defined for File daemon \"%s\" in %s.\n"),
             client->name(), configfile);
          OK = false;
@@ -1589,7 +1589,7 @@ static bool check_catalog(cat_op mode)
          need_tls = store->tls_enable || store->tls_authenticate;
 
          if ((!store->tls_ca_certfile && !store->tls_ca_certdir) && need_tls) {
-            Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+            Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                  " or \"TLS CA Certificate Dir\" are defined for Storage \"%s\" in %s.\n"),
                  store->name(), configfile);
             OK = false;
diff --git a/bacula/src/filed/bfdjson.c b/bacula/src/filed/bfdjson.c
index 78ad7225e..76bfd78ae 100644
--- a/bacula/src/filed/bfdjson.c
+++ b/bacula/src/filed/bfdjson.c
@@ -624,7 +624,7 @@ static bool check_resources()
       need_tls = me->tls_enable || me->tls_authenticate;
 
       if ((!me->tls_ca_certfile && !me->tls_ca_certdir) && need_tls) {
-         Emsg1(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg1(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
             " or \"TLS CA Certificate Dir\" are defined for File daemon in %s.\n"),
                             configfile);
         OK = false;
@@ -682,7 +682,7 @@ static bool check_resources()
       }
 
       if ((!director->dirinfo.tls_ca_certfile && !director->dirinfo.tls_ca_certdir) && need_tls && director->dirinfo.tls_verify_peer) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in %s."
                              " At least one CA certificate store is required"
                              " when using \"TLS Verify Peer\".\n"),
@@ -719,7 +719,7 @@ static bool check_resources()
       }
 
       if ((!cons->dirinfo.tls_ca_certfile && !cons->dirinfo.tls_ca_certdir) && need_tls && cons->dirinfo.tls_verify_peer) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Console \"%s\" in %s."
                              " At least one CA certificate store is required"
                              " when using \"TLS Verify Peer\".\n"),
diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index 72fdcd4a5..6397c07b8 100644
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -441,7 +441,7 @@ static bool check_resources()
       need_tls = me->tls_enable || me->tls_authenticate;
 
       if ((!me->tls_ca_certfile && !me->tls_ca_certdir) && need_tls) {
-         Emsg1(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg1(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
             " or \"TLS CA Certificate Dir\" are defined for File daemon in %s.\n"),
                             configfile);
         OK = false;
@@ -666,7 +666,7 @@ static bool check_resources()
       }
 
       if ((!director->dirinfo.tls_ca_certfile && !director->dirinfo.tls_ca_certdir) && need_tls && director->dirinfo.tls_verify_peer) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in %s."
                              " At least one CA certificate store is required"
                              " when using \"TLS Verify Peer\".\n"),
@@ -731,7 +731,7 @@ static bool check_resources()
       }
 
       if ((!console->dirinfo.tls_ca_certfile && !console->dirinfo.tls_ca_certdir) && need_tls && console->dirinfo.tls_verify_peer) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Console \"%s\" in %s."
                              " At least one CA certificate store is required"
                              " when using \"TLS Verify Peer\".\n"),
diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index a88435df2..cd52c356a 100644
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -226,7 +226,7 @@ static int check_resources()
       tls_needed = director->tls_enable || director->tls_authenticate;
 
       if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && tls_needed) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in %s."
                              " At least one CA certificate store is required.\n"),
                              director->hdr.name, configfile);
@@ -256,7 +256,7 @@ static int check_resources()
       tls_needed = cons->tls_enable || cons->tls_authenticate;
 
       if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) && tls_needed) {
-         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
                              " or \"TLS CA Certificate Dir\" are defined for Console \"%s\" in %s.\n"),
                              cons->hdr.name, configfile);
          ok = false;
diff --git a/bacula/src/stored/bsdjson.c b/bacula/src/stored/bsdjson.c
index 457052218..a61599f98 100644
--- a/bacula/src/stored/bsdjson.c
+++ b/bacula/src/stored/bsdjson.c
@@ -635,7 +635,7 @@ static int check_resources()
       }
 
       if ((!store->tls_ca_certfile && !store->tls_ca_certdir) && tls_needed && store->tls_verify_peer) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
               " or \"TLS CA Certificate Dir\" are defined for Storage \"%s\" in %s."
               " At least one CA certificate store is required"
               " when using \"TLS Verify Peer\".\n"),
@@ -667,7 +667,7 @@ static int check_resources()
       }
 
       if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && tls_needed && director->tls_verify_peer) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
               " or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in %s."
               " At least one CA certificate store is required"
               " when using \"TLS Verify Peer\".\n"),
diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index 1b185e764..fb95c6727 100644
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -431,7 +431,7 @@ static int check_resources()
       }
 
       if ((!store->tls_ca_certfile && !store->tls_ca_certdir) && tls_needed && store->tls_verify_peer) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
               " or \"TLS CA Certificate Dir\" are defined for Storage \"%s\" in %s."
               " At least one CA certificate store is required"
               " when using \"TLS Verify Peer\".\n"),
@@ -489,7 +489,7 @@ static int check_resources()
       }
 
       if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && tls_needed && director->tls_verify_peer) {
-         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+         Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate File\""
               " or \"TLS CA Certificate Dir\" are defined for Director \"%s\" in %s."
               " At least one CA certificate store is required"
               " when using \"TLS Verify Peer\".\n"),