Correct pool source setting

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

diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index df5518664be2964406876cb359088b48d8e49a35..3a46402ba65c1966d1794609eaf0669fc280c306 100644 (file)
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -177,6 +177,9 @@ bool do_verify(JCR *jcr)
       if (!start_storage_daemon_job(jcr, jcr->storage, NULL)) {
          return false;
       }
+      if (!bnet_fsend(jcr->store_bsock, "run")) {
+         return false;
+      }
       /*
        * Now start a Storage daemon message thread
        */
@@ -185,9 +188,6 @@ bool do_verify(JCR *jcr)
       }
       Dmsg0(50, "Storage daemon connection OK\n");
 
-      if (!bnet_fsend(jcr->store_bsock, "run")) {
-         return false;
-      }
    }
    /*
     * OK, now connect to the File daemon
@@ -262,7 +262,7 @@ bool do_verify(JCR *jcr)
       return false;
    }
 
-   if (!send_run_before_and_after_commands(jcr)) {
+   if (!send_runscripts_commands(jcr)) {
       return false;
    }
 
@@ -708,13 +708,13 @@ int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId)
    }
 
    /* Now find all the files that are missing -- i.e. all files in
-    *  the database where the MarkedId != current JobId
+    *  the database where the MarkId != current JobId
     */
    jcr->fn_printed = false;
    bsnprintf(buf, sizeof(buf),
 "SELECT Path.Path,Filename.Name FROM File,Path,Filename "
 "WHERE File.JobId=%d "
-"AND File.MarkedId!=%d AND File.PathId=Path.PathId "
+"AND File.MarkId!=%d AND File.PathId=Path.PathId "
 "AND File.FilenameId=Filename.FilenameId",
       JobId, jcr->JobId);
    /* missing_handler is called for each file found */