Edit FD name in connect error messages.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5633 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c
index 45b7fa7eb12270c24ba49c51989260d4c17b3136..36824c0ddada6ccc32d11dbbf9d4a7a60edd2461 100644 (file)
--- a/bacula/src/dird/fd_cmds.c
+++ b/bacula/src/dird/fd_cmds.c
@@ -90,9 +90,11 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time,
    }
 
    if (!jcr->file_bsock) {
+      char name[MAX_NAME_LENGTH + 100];
+      bstrncpy(name, _("Client: "), sizeof(name));
+      bstrncat(name, jcr->client->name(), sizeof(name));
       fd = bnet_connect(jcr, retry_interval, max_retry_time, heart_beat,
-           _("File daemon"), jcr->client->address,
-           NULL, jcr->client->FDport, verbose);
+           name, jcr->client->address, NULL, jcr->client->FDport, verbose);
       if (fd == NULL) {
          set_jcr_job_status(jcr, JS_ErrorTerminated);
          return 0;

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 69ce06e06948d9ac1c24f3ece1346940dfb70791..e3e7b2602931f9d7ef9f7203079ea0b15dd09c9b 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,7 @@
 
 General:
 23Sep07 
+kes  Edit FD name in connect error messages.
 kes  Rework the reservation system to take into account that the Director
      might give us a Volume that is different from the current one being
      used, and to ensure that we don't exceed Maximum Volume Jobs.