Fix #3854 missing tls library initialization in bdirjson, bfdjson, bsdjson and bbconsjson

diff --git a/bacula/src/console/bbconsjson.c b/bacula/src/console/bbconsjson.c
index f85fc4d4a6371749269e34d9a6aafa0c952da979..d4c088d188c3b98b076bdf78d0523c214d00f9a7 100644 (file)
--- a/bacula/src/console/bbconsjson.c
+++ b/bacula/src/console/bbconsjson.c
@@ -115,6 +115,10 @@ int main(int argc, char *argv[])
    bindtextdomain("bacula", LOCALEDIR);
    textdomain("bacula");
 
+   if (init_crypto() != 0) {
+      Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
+   }
+
    init_stack_dump();
    lmgr_init_thread();
    my_name_is(argc, argv, "bconsole");

diff --git a/bacula/src/dird/bdirjson.c b/bacula/src/dird/bdirjson.c
index f5d4706365fea6640bf492dc6d801552302618b7..541ba4d4587773780557cb2b3c6ba1cabf04c133 100644 (file)
--- a/bacula/src/dird/bdirjson.c
+++ b/bacula/src/dird/bdirjson.c
@@ -122,6 +122,10 @@ int main (int argc, char *argv[])
    bindtextdomain("bacula", LOCALEDIR);
    textdomain("bacula");
 
+   if (init_crypto() != 0) {
+      Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
+   }
+
    my_name_is(argc, argv, "bacula-dir");
    init_msg(NULL, NULL);
 
@@ -1255,7 +1259,7 @@ static bool check_resources(bool apply_jobdefs)
             cons->tls_keyfile, NULL, NULL, cons->tls_dhfile, cons->tls_verify_peer);
 
          if (!cons->tls_ctx) {
-            Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for File daemon \"%s\" in %s.\n"),
+            Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for Console \"%s\" in %s.\n"),
                cons->name(), configfile);
             OK = false;
          }

diff --git a/bacula/src/filed/bfdjson.c b/bacula/src/filed/bfdjson.c
index 7862cded2f9a2777ab7d95320e38337675deddb7..a3a87bec38324b544c36438cd5322e9fda6c6e50 100644 (file)
--- a/bacula/src/filed/bfdjson.c
+++ b/bacula/src/filed/bfdjson.c
@@ -128,6 +128,10 @@ int main (int argc, char *argv[])
    bindtextdomain("bacula", LOCALEDIR);
    textdomain("bacula");
 
+   if (init_crypto() != 0) {
+      Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
+   }
+
    my_name_is(argc, argv, "bacula-fd");
    init_msg(NULL, NULL);
 

diff --git a/bacula/src/stored/bsdjson.c b/bacula/src/stored/bsdjson.c
index f24ab13ee7d53688d83c65b714c3b9f0accba917..27e3c176fdabf9b2e07b1993260e6acae69264e4 100644 (file)
--- a/bacula/src/stored/bsdjson.c
+++ b/bacula/src/stored/bsdjson.c
@@ -331,6 +331,10 @@ static void dump_json(display_filter *filter)
    regmatch_t pmatch[32];
    STORES *me = (STORES *)GetNextRes(R_STORAGE, NULL);
 
+   if (init_crypto() != 0) {
+      Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
+   }
+
    init_hpkt(hpkt);
 
    if (filter->do_only_data) {