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 <bwal...@artsci.utoronto.ca>
---
bacula/src/console/authenticate.c | 2 +-
bacula/src/dird/authenticate.c | 4 ++--
bacula/src/filed/authenticate.c | 2 +-
bacula/src/lib/bsock.c | 2 +-
bacula/src/qt-console/bcomm/dircomm_auth.cpp | 2 +-
.../src/qt-console/tray-monitor/authenticate.cpp | 6 +++---
bacula/src/stored/authenticate.c | 8 ++++----
bacula/src/tray-monitor/authenticate.c | 6 +++---
bacula/src/wx-console/authenticate.c | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/bacula/src/console/authenticate.c
b/bacula/src/console/authenticate.c
index 13dc2b8..a47422b 100644
--- 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 5627830..bae5734 100644
--- 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 dae5fb5..2b32541 100644
--- 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 a6b0f4f..cc3231b 100644
--- 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 c1bba06..331a628 100644
--- 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 35a4d19..c9b09bc 100644
--- 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 53f0f45..cea939a 100644
--- 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 d380294..9a3acc5 100644
--- 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 30a8398..5f9c27d 100644
--- 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;
}
--
1.7.4.1
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
_______________________________________________
Bacula-devel mailing list
Bacula-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-devel
