Update auth troubleshooting URL to use MANUAL_AUTH_URL macro

Now that we have a macro for the currently preferred help resource for
use in troubleshooting authentication problem, remove the direct URL
string from help text and replace it with the macro.  This will make
future URL changes simpler.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>

diff --git a/bacula/src/console/authenticate.c b/bacula/src/console/authenticate.c
index 13dc2b86a0d4cae4ae52233befa6618164b13274..a47422b415b00b6b90f97a43663b79eee2d0db60 100644 (file)
--- a/bacula/src/console/authenticate.c
+++ b/bacula/src/console/authenticate.c
@@ -172,6 +172,6 @@ bail_out:
    sendit( _("Director authorization problem.\n"
              "Most likely the passwords do not agree.\n"
              "If you are using TLS, there may have been a certificate validation error during the TLS handshake.\n"
-             "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+             "Please see " MANUAL_AUTH_URL " for help.\n"));
    return 0;
 }

diff --git a/bacula/src/dird/authenticate.c b/bacula/src/dird/authenticate.c
index 56278306f68151b218c0c616241583c7ab4a6e25..bae57343d583747c1f58bc32decc6e758d80623c 100644 (file)
--- a/bacula/src/dird/authenticate.c
+++ b/bacula/src/dird/authenticate.c
@@ -116,7 +116,7 @@ bool authenticate_storage_daemon(JCR *jcr, STORE *store)
             "Passwords or names not the same or\n"
             "Maximum Concurrent Jobs exceeded on the SD or\n"
             "SD networking messed up (restart daemon).\n"
-            "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"),
+            "Please see " MANUAL_AUTH_URL " for help.\n"),
             sd->host(), sd->port());
       return 0;
    }
@@ -225,7 +225,7 @@ int authenticate_file_daemon(JCR *jcr)
             "Passwords or names not the same or\n"
             "Maximum Concurrent Jobs exceeded on the FD or\n"
             "FD networking messed up (restart daemon).\n"
-            "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"),
+            "Please see " MANUAL_AUTH_URL " for help.\n"),
             fd->host(), fd->port());
       return 0;
    }

diff --git a/bacula/src/filed/authenticate.c b/bacula/src/filed/authenticate.c
index dae5fb568c30165f159adfa9c44706c634ce94ce..2b32541df9eadb4e8076fffe6b007e50c99f4d71 100644 (file)
--- a/bacula/src/filed/authenticate.c
+++ b/bacula/src/filed/authenticate.c
@@ -259,7 +259,7 @@ int authenticate_storagedaemon(JCR *jcr)
 
    if (!auth_success) {
       Jmsg(jcr, M_FATAL, 0, _("Authorization key rejected by Storage daemon.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+       "Please see " MANUAL_AUTH_URL " for help.\n"));
       goto auth_fatal;
    }
 

diff --git a/bacula/src/lib/bsock.c b/bacula/src/lib/bsock.c
index a6b0f4f4b8732c3cc97730178565f9ccac68d95c..cc3231b2c0ae02541c932ab1e0a5ab807b488984 100644 (file)
--- a/bacula/src/lib/bsock.c
+++ b/bacula/src/lib/bsock.c
@@ -1051,7 +1051,7 @@ bail_out:
    bsnprintf(response, response_len, _("Authorization problem with Director at \"%s:%d\"\n"
              "Most likely the passwords do not agree.\n"
              "If you are using TLS, there may have been a certificate validation error during the TLS handshake.\n"
-             "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"), 
+             "Please see " MANUAL_AUTH_URL " for help.\n"),
              dir->host(), dir->port());
    return false;
 }

diff --git a/bacula/src/qt-console/bcomm/dircomm_auth.cpp b/bacula/src/qt-console/bcomm/dircomm_auth.cpp
index c1bba06d2c8da7371f5d953ab7eeb9a49ee7276f..331a628ae2a6a6ee67ad1aa4bf0c563dcc140888 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm_auth.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm_auth.cpp
@@ -171,7 +171,7 @@ bail_out:
    bsnprintf(errmsg, errmsg_len, _("Authorization problem with Director at \"%s:%d\"\n"
              "Most likely the passwords do not agree.\n"
              "If you are using TLS, there may have been a certificate validation error during the TLS handshake.\n"
-             "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"), 
+             "Please see " MANUAL_AUTH_URL " for help.\n"),
              dir->host(), dir->port());
    return false;
 }

diff --git a/bacula/src/qt-console/tray-monitor/authenticate.cpp b/bacula/src/qt-console/tray-monitor/authenticate.cpp
index 35a4d19bf87fb29687303dfa9e189ca7511ff822..c9b09bc694cd5cf9fd76875dd1c37cd202d7600a 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/authenticate.cpp
+++ b/bacula/src/qt-console/tray-monitor/authenticate.cpp
@@ -86,7 +86,7 @@ int authenticate_director(JCR *jcr, MONITOR *mon, DIRRES *director)
       stop_bsock_timer(tid);
       Jmsg0(jcr, M_FATAL, 0, _("Director authorization problem.\n"
             "Most likely the passwords do not agree.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+       "Please see " MANUAL_AUTH_URL " for help.\n"));
       return 0;
    }
 
@@ -135,7 +135,7 @@ int authenticate_storage_daemon(JCR *jcr, MONITOR *monitor, STORE* store)
        !cram_md5_challenge(sd, store->password, tls_local_need, compatible)) {
       stop_bsock_timer(tid);
       Jmsg0(jcr, M_FATAL, 0, _("Director and Storage daemon passwords or names not the same.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+       "Please see " MANUAL_AUTH_URL " for help.\n"));
       return 0;
    }
    Dmsg1(116, ">stored: %s", sd->msg);
@@ -181,7 +181,7 @@ int authenticate_file_daemon(JCR *jcr, MONITOR *monitor, CLIENT* client)
        !cram_md5_challenge(fd, client->password, tls_local_need, compatible)) {
       stop_bsock_timer(tid);
       Jmsg(jcr, M_FATAL, 0, _("Director and File daemon passwords or names not the same.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+       "Please see " MANUAL_AUTH_URL " for help.\n"));
       return 0;
    }
    Dmsg1(116, ">filed: %s", fd->msg);

diff --git a/bacula/src/stored/authenticate.c b/bacula/src/stored/authenticate.c
index 53f0f4567ed8d27c8399c49e3d081d57337f782d..cea939a2f919ce637fb6372a71e9f60a33c6385a 100644 (file)
--- a/bacula/src/stored/authenticate.c
+++ b/bacula/src/stored/authenticate.c
@@ -91,7 +91,7 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
       Dmsg2(dbglvl, "Connection from unknown Director %s at %s rejected.\n",
             dirname, bs->who());
       Jmsg2(jcr, M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"),
+       "Please see " MANUAL_AUTH_URL " for help.\n"),
             dirname, bs->who());
       free_pool_memory(dirname);
       return 0;
@@ -128,7 +128,7 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
 
    if (!auth_success) {
       Jmsg0(jcr, M_FATAL, 0, _("Incorrect password given by Director.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+       "Please see " MANUAL_AUTH_URL " for help.\n"));
       auth_success = false;
       goto auth_fatal;
    }
@@ -238,7 +238,7 @@ int authenticate_filed(JCR *jcr)
 
    if (!auth_success) {
       Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon at %s rejected.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"),
+       "Please see " MANUAL_AUTH_URL " for help.\n"),
            fd->who());
       auth_success = false;
       goto auth_fatal;
@@ -278,7 +278,7 @@ auth_fatal:
    stop_bsock_timer(tid);
    if (!auth_success) {
       Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon at %s rejected.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"),
+       "Please see " MANUAL_AUTH_URL " for help.\n"),
            fd->who());
    }
    jcr->authenticated = auth_success;

diff --git a/bacula/src/tray-monitor/authenticate.c b/bacula/src/tray-monitor/authenticate.c
index d380294d32276ae719309776acdbacb1d555980c..9a3acc5e2dc99bc8ac5137a46b55461b9dd6b243 100644 (file)
--- a/bacula/src/tray-monitor/authenticate.c
+++ b/bacula/src/tray-monitor/authenticate.c
@@ -87,7 +87,7 @@ int authenticate_director(JCR *jcr, MONITOR *mon, DIRRES *director)
       stop_bsock_timer(tid);
       Jmsg0(jcr, M_FATAL, 0, _("Director authorization problem.\n"
             "Most likely the passwords do not agree.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+       "Please see " MANUAL_AUTH_URL " for help.\n"));
       return 0;
    }
 
@@ -136,7 +136,7 @@ int authenticate_storage_daemon(JCR *jcr, MONITOR *monitor, STORE* store)
        !cram_md5_challenge(sd, store->password, tls_local_need, compatible)) {
       stop_bsock_timer(tid);
       Jmsg0(jcr, M_FATAL, 0, _("Director and Storage daemon passwords or names not the same.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+       "Please see " MANUAL_AUTH_URL " for help.\n"));
       return 0;
    }
    Dmsg1(116, ">stored: %s", sd->msg);
@@ -182,7 +182,7 @@ int authenticate_file_daemon(JCR *jcr, MONITOR *monitor, CLIENT* client)
        !cram_md5_challenge(fd, client->password, tls_local_need, compatible)) {
       stop_bsock_timer(tid);
       Jmsg(jcr, M_FATAL, 0, _("Director and File daemon passwords or names not the same.\n"
-       "Please see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+       "Please see " MANUAL_AUTH_URL " for help.\n"));
       return 0;
    }
    Dmsg1(116, ">filed: %s", fd->msg);

diff --git a/bacula/src/wx-console/authenticate.c b/bacula/src/wx-console/authenticate.c
index 30a8398bd5b9f55ba0ae84943df4bf533aff5e19..5f9c27d0f73d8ccaac99c803a0c52026df9cfa36 100644 (file)
--- a/bacula/src/wx-console/authenticate.c
+++ b/bacula/src/wx-console/authenticate.c
@@ -164,7 +164,7 @@ int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons)
 
 bail_out:
    stop_bsock_timer(tid);
-   csprint( _("Director authorization problem.\nMost likely the passwords do not agree.\nIf you are using TLS, there may have been a certificate validation error during the TLS handshake.\nPlease see http://www.bacula.org/en/rel-manual/Bacula_Freque_Asked_Questi.html#SECTION003760000000000000000 for help.\n"));
+   csprint( _("Director authorization problem.\nMost likely the passwords do not agree.\nIf you are using TLS, there may have been a certificate validation error during the TLS handshake.\nPlease see " MANUAL_AUTH_URL " for help.\n"));
    return 0;
 
 }