Fix bscan walk DCRs + add some bools to dev.c

[bacula/bacula] / bacula / src / stored / stored.c

diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index fe12febbea2cb68f20d3336b33ebd30d890e3908..957738336fb02483cd4b80d8cb9a2031098582fb 100644 (file)
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -228,7 +228,7 @@ int main (int argc, char *argv[])
                                 
    /* Single server used for Director and File daemon */
    bnet_thread_server(me->SDaddr, me->SDport, me->max_concurrent_jobs * 2 + 1,
-                     &dird_workq, connection_request);
+                     &dird_workq, handle_connection_request);
    exit(1);                          /* to keep compiler quiet */
 }
 
@@ -324,9 +324,15 @@ void *device_allocation(void *arg)
         JCR *jcr;
         DCR *dcr;
         jcr = new_jcr(sizeof(JCR), stored_free_jcr);
+        jcr->JobType = JT_SYSTEM;
+        /* Initialize FD start condition variable */
+        int errstat = pthread_cond_init(&jcr->job_start_wait, NULL);
+        if (errstat != 0) {
+            Jmsg1(jcr, M_ABORT, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
+        }
         jcr->device = device;
         dcr = new_dcr(jcr, device->dev);
-        switch (read_dev_volume_label(jcr, device->dev, dcr->block)) {
+        switch (read_dev_volume_label(dcr, dcr->block)) {
            case VOL_OK:
               break;
            default: