Ensure that StorageId is updated after write

[bacula/bacula] / bacula / src / dird / authenticate.c

diff --git a/bacula/src/dird/authenticate.c b/bacula/src/dird/authenticate.c
index 56278306f68151b218c0c616241583c7ab4a6e25..a69b2779dc8996412e9a4a161f5dd621ba1ab20a 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;
    }
@@ -290,7 +290,6 @@ int authenticate_user_agent(UAContext *uac)
    char name[MAX_NAME_LENGTH];
    int tls_local_need = BNET_TLS_NONE;
    int tls_remote_need = BNET_TLS_NONE;
-   bool need_tls;
    bool tls_authenticate;
    int compatible = true;
    CONRES *cons = NULL;
@@ -324,7 +323,6 @@ int authenticate_user_agent(UAContext *uac)
       }
 
       tls_authenticate = director->tls_authenticate;
-      need_tls = director->tls_enable || tls_authenticate;
 
       if (tls_authenticate) {
          tls_local_need = BNET_TLS_REQUIRED;
@@ -351,7 +349,6 @@ int authenticate_user_agent(UAContext *uac)
          }
 
          tls_authenticate = cons->tls_authenticate;
-         need_tls = cons->tls_enable || tls_authenticate;
 
          if (tls_authenticate) {
             tls_local_need = BNET_TLS_REQUIRED;