X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fappend.c;h=78c85243699fce3a848016aa43fb486c0148999d;hb=5acaefa52eef9207ee62d4fe9d231701c0dc4529;hp=1e5b5f91ffce0f46a6e674a7b3fb3ad2308029ab;hpb=c37638750b04e222c9436d70c55d28193c58a86f;p=bacula%2Fbacula

diff --git a/bacula/src/stored/append.c b/bacula/src/stored/append.c
index 1e5b5f91ff..78c8524369 100644
--- a/bacula/src/stored/append.c
+++ b/bacula/src/stored/append.c
@@ -7,7 +7,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -38,6 +38,7 @@
 
 /* Responses sent to the File daemon */
 static char OK_data[]    = "3000 OK data\n";
+static char OK_append[]  = "3000 OK append data\n";
 
 /* Forward referenced functions */
 
@@ -83,7 +84,6 @@ bool do_append_data(JCR *jcr)
 
    if (!acquire_device_for_append(dcr)) {
       set_jcr_job_status(jcr, JS_ErrorTerminated);
-      jcr->dcr = NULL;
       return false;
    }
 
@@ -262,6 +262,14 @@ bool do_append_data(JCR *jcr)
       }
    }
 
+   /* Create Job status for end of session label */
+   set_jcr_job_status(jcr, ok?JS_Terminated:JS_ErrorTerminated);
+
+   /* Terminate connection with FD */
+   bnet_fsend(ds, OK_append);
+   do_fd_commands(jcr);               /* finish dialog with FD */
+
+
    time_t job_elapsed = time(NULL) - jcr->run_time;
 
    if (job_elapsed <= 0) {
@@ -272,16 +280,14 @@ bool do_append_data(JCR *jcr)
          job_elapsed / 3600, job_elapsed % 3600 / 60, job_elapsed % 60,
          edit_uint64_with_suffix(jcr->JobBytes / job_elapsed, ec));
 
-   /* Create Job status for end of session label */
-   set_jcr_job_status(jcr, ok?JS_Terminated:JS_ErrorTerminated);
 
    Dmsg1(200, "Write EOS label JobStatus=%c\n", jcr->JobStatus);
 
    /*
-    * If !OK, check if we can still write. This may not be the case
+    * Check if we can still write. This may not be the case
     *  if we are at the end of the tape or we got a fatal I/O error.
     */
-   if (ok || dev->can_write()) {
+   if (dev->can_write()) {
       if (!write_session_label(dcr, EOS_LABEL)) {
          Jmsg1(jcr, M_FATAL, 0, _("Error writting end session label. ERR=%s\n"),
                dev->bstrerror());
@@ -299,10 +305,11 @@ bool do_append_data(JCR *jcr)
          Dmsg0(100, _("Set ok=FALSE after write_block_to_device.\n"));
          ok = false;
       }
+      if (dev->VolCatInfo.VolCatName[0] == 0) {
+         Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
+      }
    }
-   if (dev->VolCatInfo.VolCatName[0] == 0) {
-      Pmsg0(000, _("NULL Volume name. This shouldn't happen!!!\n"));
-   }
+
 
    if (!ok) {
       discard_data_spool(dcr);