Final changes

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

diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c
index cbc4bbb5e5e3f7fedc924819170f9c6ded66f6b8..4c6b4c706f5fc34c2faf5c9902200295c4f3a4bb 100644 (file)
--- a/bacula/src/dird/migrate.c
+++ b/bacula/src/dird/migrate.c
@@ -354,6 +354,7 @@ static int unique_name_handler(void *ctx, int num_fields, char **row)
    return 0;
 }
 
+#ifdef xxx  /* in development */
 static int unique_dbid_handler(void *ctx, int num_fields, char **row)
 {
    dlist *list = (dlist *)ctx;
@@ -372,7 +373,7 @@ static int unique_dbid_handler(void *ctx, int num_fields, char **row)
    }
    return 0;
 }
-
+#endif
 
 
 

diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index a4075474467879e12c2df4c6f7ca48ef4f545ed3..d1dd6258d5d56c0c2eca91b5eb98041c4d0e1b3b 100644 (file)
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -502,6 +502,9 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId)
       char *attr, *p, *fn;
       char Opts_Digest[MAXSTRING];        /* Verify Opts or MD5/SHA1 digest */
 
+      if (job_canceled(jcr)) {
+         return false;
+      }
       fname = check_pool_memory_size(fname, fd->msglen);
       jcr->fname = check_pool_memory_size(jcr->fname, fd->msglen);
       Dmsg1(200, "Atts+Digest=%s\n", fd->msg);
@@ -736,6 +739,9 @@ static int missing_handler(void *ctx, int num_fields, char **row)
 {
    JCR *jcr = (JCR *)ctx;
 
+   if (job_canceled(jcr)) {
+      return 1;
+   }
    if (!jcr->fn_printed) {
       Jmsg(jcr, M_INFO, 0, "\n");
       Jmsg(jcr, M_INFO, 0, _("The following files are missing:\n"));