Fix typo

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

diff --git a/bacula/src/dird/msgchan.c b/bacula/src/dird/msgchan.c
index 304cfd53365d9cf4f563d744160ba3d0db884bb2..1afe148ba69a3cc83a86e585046db0edc5814775 100644 (file)
--- a/bacula/src/dird/msgchan.c
+++ b/bacula/src/dird/msgchan.c
@@ -16,7 +16,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -40,7 +40,7 @@
 
 /* Commands sent to Storage daemon */
 static char jobcmd[]     = "JobId=%d job=%s job_name=%s client_name=%s \
-type=%d level=%d FileSet=%s NoAttr=%d SpoolAttr=%d FileSetMD5=%s\n";
+type=%d level=%d FileSet=%s NoAttr=%d SpoolAttr=%d FileSetMD5=%s SpoolData=%d";
 static char use_device[] = "use device=%s media_type=%s pool_name=%s pool_type=%s\n";
 
 /* Response from Storage daemon */
@@ -95,7 +95,6 @@ int start_storage_daemon_job(JCR *jcr)
    BSOCK *sd;
    char auth_key[100];
    POOLMEM *device_name, *pool_name, *pool_type, *media_type;
-   int device_name_len, pool_name_len, pool_type_len, media_type_len;
 
    storage = jcr->store;
    sd = jcr->store_bsock;
@@ -111,7 +110,7 @@ int start_storage_daemon_job(JCR *jcr)
    bnet_fsend(sd, jobcmd, jcr->JobId, jcr->Job, jcr->job->hdr.name, 
              jcr->client->hdr.name, jcr->JobType, jcr->JobLevel, 
              jcr->fileset->hdr.name, !jcr->pool->catalog_files,
-             jcr->job->SpoolAttributes, jcr->fileset->MD5);
+             jcr->job->SpoolAttributes, jcr->fileset->MD5, jcr->spool_data);
    Dmsg1(200, "Jobcmd=%s\n", sd->msg);
    unbash_spaces(jcr->job->hdr.name);
    unbash_spaces(jcr->client->hdr.name);
@@ -136,24 +135,18 @@ int start_storage_daemon_job(JCR *jcr)
    /*
     * Send use device = xxx media = yyy pool = zzz
     */
-   device_name_len = strlen(storage->dev_name) + 1;
-   media_type_len = strlen(storage->media_type) + 1;
-   pool_type_len = strlen(jcr->pool->pool_type) + 1;
-   pool_name_len = strlen(jcr->pool->hdr.name) + 1;
-   device_name = get_memory(device_name_len);
-   pool_name = get_memory(pool_name_len);
-   pool_type = get_memory(pool_type_len);
-   media_type = get_memory(media_type_len);
-   memcpy(device_name, storage->dev_name, device_name_len);
-   memcpy(media_type, storage->media_type, media_type_len);
-   memcpy(pool_type, jcr->pool->pool_type, pool_type_len);
-   memcpy(pool_name, jcr->pool->hdr.name, pool_name_len);
+   device_name = get_pool_memory(PM_NAME);
+   pool_name = get_pool_memory(PM_NAME);
+   pool_type = get_pool_memory(PM_NAME);
+   media_type = get_pool_memory(PM_NAME);
+   pm_strcpy(&device_name, storage->dev_name);
+   pm_strcpy(&media_type, storage->media_type);
+   pm_strcpy(&pool_type, jcr->pool->pool_type);
+   pm_strcpy(&pool_name, jcr->pool->hdr.name);
    bash_spaces(device_name);
    bash_spaces(media_type);
    bash_spaces(pool_type);
    bash_spaces(pool_name);
-   sd->msg = check_pool_memory_size(sd->msg, sizeof(device_name) +
-      device_name_len + media_type_len + pool_type_len + pool_name_len);
    bnet_fsend(sd, use_device, device_name, media_type, pool_name, pool_type);
    Dmsg1(110, ">stored: %s", sd->msg);
    status = response(jcr, sd, OK_device, "Use Device", NO_DISPLAY);
@@ -163,7 +156,6 @@ int start_storage_daemon_job(JCR *jcr)
          "     Storage daemon didn't accept Device \"%s\" because:\n     %s"),
         device_name, pool_type/* sd->msg */);
    }
-         
    free_memory(device_name);
    free_memory(media_type);
    free_memory(pool_name);
@@ -204,6 +196,7 @@ static void msg_thread_cleanup(void *arg)
    P(jcr->mutex);
    jcr->sd_msg_thread_done = true;
    pthread_cond_broadcast(&jcr->term_wait); /* wakeup any waiting threads */
+   jcr->SD_msg_chan = 0;
    V(jcr->mutex);
    free_jcr(jcr);                    /* release jcr */
 }