Make a few tls ifdef tweaks

[bacula/bacula] / bacula / src / filed / filed.c

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index 688a3e4ce568d1ad8b5b33c9a05f995f3cace6db..7f6fb12ff7209387d1ce0511a5de4d618f6dc58a 100644 (file)
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -262,9 +262,7 @@ void terminate_filed(int sig)
    free_config_resources();
    term_msg();
    stop_watchdog();
-#ifdef HAVE_TLS
    cleanup_tls();
-#endif
    close_memory_pool();               /* release free memory in pool */
    sm_dump(false);                    /* dump orphaned buffers */
    exit(sig);
@@ -288,45 +286,45 @@ static int check_resources()
       OK = false;
    } else {
       if (GetNextRes(R_CLIENT, (RES *) me) != NULL) {
-        Emsg1(M_FATAL, 0, _("Only one Client resource permitted in %s\n"),
-             configfile);
-        OK = false;
+         Emsg1(M_FATAL, 0, _("Only one Client resource permitted in %s\n"),
+              configfile);
+         OK = false;
       }
       my_name_is(0, NULL, me->hdr.name);
       if (!me->messages) {
-        me->messages = (MSGS *)GetNextRes(R_MSGS, NULL);
+         me->messages = (MSGS *)GetNextRes(R_MSGS, NULL);
          if (!me->messages) {
              Emsg1(M_FATAL, 0, _("No Messages resource defined in %s\n"), configfile);
-            OK = false;
+             OK = false;
          }
       }
 #ifdef HAVE_TLS
       /* tls_require implies tls_enable */
       if (me->tls_require) {
-        me->tls_enable = true;
+         me->tls_enable = true;
       }
 
       if ((!me->tls_ca_certfile && !me->tls_ca_certdir) && me->tls_enable) {
-        Emsg1(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
-           " or \"TLS CA Certificate Dir\" are defined for File daemon in %s.\n"),
-                           configfile);
-       OK = false;
+         Emsg1(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+            " or \"TLS CA Certificate Dir\" are defined for File daemon in %s.\n"),
+                            configfile);
+        OK = false;
       }
 
       /* If everything is well, attempt to initialize our per-resource TLS context */
       if (OK && (me->tls_enable || me->tls_require)) {
-        /* Initialize TLS context:
-         * Args: CA certfile, CA certdir, Certfile, Keyfile,
-         * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
-        me->tls_ctx = new_tls_context(me->tls_ca_certfile,
-           me->tls_ca_certdir, me->tls_certfile, me->tls_keyfile,
-           NULL, NULL, NULL, true);
-
-        if (!me->tls_ctx) { 
-           Emsg2(M_FATAL, 0, _("Failed to initialize TLS context for File daemon \"%s\" in %s.\n"),
-                               me->hdr.name, configfile);
-           OK = false;
-        }
+         /* Initialize TLS context:
+          * Args: CA certfile, CA certdir, Certfile, Keyfile,
+          * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
+         me->tls_ctx = new_tls_context(me->tls_ca_certfile,
+            me->tls_ca_certdir, me->tls_certfile, me->tls_keyfile,
+            NULL, NULL, NULL, true);
+
+         if (!me->tls_ctx) { 
+            Emsg2(M_FATAL, 0, _("Failed to initialize TLS context for File daemon \"%s\" in %s.\n"),
+                                me->hdr.name, configfile);
+            OK = false;
+         }
       }
 
 #endif /* HAVE_TLS */
@@ -339,7 +337,7 @@ static int check_resources()
    UnlockRes();
    if (!director) {
       Emsg1(M_FATAL, 0, _("No Director resource defined in %s\n"),
-           configfile);
+            configfile);
       OK = false;
    }
 
@@ -347,45 +345,45 @@ static int check_resources()
    foreach_res(director, R_DIRECTOR) { 
       /* tls_require implies tls_enable */
       if (director->tls_require) {
-        director->tls_enable = true;
+         director->tls_enable = true;
       }
 
       if (!director->tls_certfile && director->tls_enable) {
-        Emsg2(M_FATAL, 0, _("\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n"),
-              director->hdr.name, configfile);
-        OK = false;
+         Emsg2(M_FATAL, 0, _("\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n"),
+               director->hdr.name, configfile);
+         OK = false;
       }
 
       if (!director->tls_keyfile && director->tls_enable) {
-        Emsg2(M_FATAL, 0, _("\"TLS Key\" file not defined for Director \"%s\" in %s.\n"),
-              director->hdr.name, configfile);
-        OK = false;
+         Emsg2(M_FATAL, 0, _("\"TLS Key\" file not defined for Director \"%s\" in %s.\n"),
+               director->hdr.name, configfile);
+         OK = false;
       }
 
       if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && director->tls_enable && director->tls_verify_peer) {
-        Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
-                            " 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"),
-                            director->hdr.name, configfile);
-        OK = false;
+         Emsg2(M_FATAL, 0, _("Neither \"TLS CA Certificate\""
+                             " 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"),
+                             director->hdr.name, configfile);
+         OK = false;
       }
 
       /* If everything is well, attempt to initialize our per-resource TLS context */
       if (OK && (director->tls_enable || director->tls_require)) {
-        /* Initialize TLS context:
-         * Args: CA certfile, CA certdir, Certfile, Keyfile,
-         * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
-        director->tls_ctx = new_tls_context(director->tls_ca_certfile,
-           director->tls_ca_certdir, director->tls_certfile,
-           director->tls_keyfile, NULL, NULL, director->tls_dhfile,
-           director->tls_verify_peer);
-
-        if (!director->tls_ctx) { 
-           Emsg2(M_FATAL, 0, _("Failed to initialize TLS context for Director \"%s\" in %s.\n"),
-                               director->hdr.name, configfile);
-           OK = false;
-        }
+         /* Initialize TLS context:
+          * Args: CA certfile, CA certdir, Certfile, Keyfile,
+          * Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
+         director->tls_ctx = new_tls_context(director->tls_ca_certfile,
+            director->tls_ca_certdir, director->tls_certfile,
+            director->tls_keyfile, NULL, NULL, director->tls_dhfile,
+            director->tls_verify_peer);
+
+         if (!director->tls_ctx) { 
+            Emsg2(M_FATAL, 0, _("Failed to initialize TLS context for Director \"%s\" in %s.\n"),
+                                director->hdr.name, configfile);
+            OK = false;
+         }
       }
    }
 #endif /* HAVE_TLS */
@@ -399,4 +397,3 @@ static int check_resources()
 
    return OK;
 }
-