Fix doc format error

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index cd8826152440e3c3ec8b879a4f7ac5f2dfe2d2f1..89ff628d6d7cd24a06aefd61b9cb41ce9b3760fb 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -16,6 +16,12 @@ Testing to do: (painful)
 - multiple simultaneous Volumes
 
 For 1.30 release:
+- Make some way so that if a machine is skipped because it is not up 
+  that Bacula will continue retrying for a specified period of time --
+  periodically.
+- Figure out some way to estimate output size and to avoid splitting
+  a backup across two Volumes -- this could be useful for writing CDROMs
+  where you really prefer not to have it split -- not serious.
 - Add chflags() code for FreeBSD file flags
 - Add RunBeforeJob and RunAfterJob to the Client program.
 - Have SD compute MD5 or SHA1 and compare to what FD computes.
@@ -838,4 +844,3 @@ Done: (see kernsdone for more)
 - Flush all the daemon messages at the end of every job.
 - Change stat1= fgets()!=NULL to stat1=fgest()==NULL; in 
   run_program -- bpipe.c
-

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 207e5d96971f2ffe6e2e982f45cbc1b319c4e804..88ad1569dfe336863f66ba050dcfb3ff5c0bb0dd 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -181,11 +181,11 @@ void *handle_client_request(void *dirp)
               bnet_fsend(dir, no_auth);
               break;
            }
+           found = TRUE;                /* indicate command found */
            if (!cmds[i].func(jcr)) {    /* do command */
-              quit = TRUE;              /* error, get out */
+              quit = TRUE;              /* error or fully terminated,  get out */
                Pmsg0(20, "Command error\n");
            }
-           found = TRUE;            /* indicate command found */
            break;
         }
       }
@@ -608,7 +608,7 @@ cleanup:
    /* Inform Director that we are done */
    bnet_sig(dir, BNET_TERMINATE);
 
-   return jcr->JobStatus == JS_Terminated;
+   return 0;                         /* return and stop command loop */
 }
 
 /*  
@@ -671,7 +671,8 @@ static int verify_cmd(JCR *jcr)
    }
 
    /* Inform Director that we are done */
-   return bnet_sig(dir, BNET_TERMINATE);
+   bnet_sig(dir, BNET_TERMINATE);
+   return 0;                         /* return and terminate command loop */
 }
 
 /*  
@@ -753,7 +754,7 @@ bail_out:
    bnet_sig(dir, BNET_TERMINATE);
 
    Dmsg0(130, "Done in job.c\n");
-   return !job_cancelled(jcr);
+   return 0;                         /* return and terminate command loop */
 }
 
 static int open_sd_read_session(JCR *jcr)

diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c
index 4f49443f5105a4607b343e37e3dc6f90d710e866..e3a51fbc2da556043be8c972368758ec579b2e7b 100644 (file)
--- a/bacula/src/stored/askdir.c
+++ b/bacula/src/stored/askdir.c
@@ -158,6 +158,7 @@ int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel)
       Jmsg0(jcr, M_ERROR, 0, _("NULL Volume name. This shouldn't happen!!!\n"));
       return 0;
    }
+   bash_spaces(vol->VolCatName);
    bnet_fsend(dir, Update_media, jcr->Job, 
       vol->VolCatName, vol->VolCatJobs, vol->VolCatFiles,
       vol->VolCatBlocks, edit_uint64(vol->VolCatBytes, ed1),
@@ -165,6 +166,7 @@ int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel)
       vol->VolCatWrites, edit_uint64(vol->VolCatMaxBytes, ed2), 
       EndTime, vol->VolCatStatus, vol->Slot, relabel);
    Dmsg1(120, "update_volume_data(): %s", dir->msg);
+   unbash_spaces(vol->VolCatName);
    if (bnet_recv(dir) <= 0) {
       Dmsg0(190, "updateVolCatInfo error bnet_recv\n");
       Jmsg(jcr, M_ERROR, 0, _("Error updating Volume Info: %s\n"),