Merge branch 'master' into basejobv3

diff --cc bacula/src/filed/backup.c
index e92f880b4f7d7102f47ffd6629c70fbcfc3a51b6,f46b2c304bb7631884282be4dddd3df9695ac7ab..83b60508618e89b57c5f2c1d58d19a9f649a7176
--- 1/bacula/src/filed/backup.c
--- 2/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@@ -155,16 -158,16 +158,16 @@@ bool blast_data_to_storage_daemon(JCR *
        set_jcr_job_status(jcr, JS_ErrorTerminated);
     }
  
-    if (jcr->total_acl_errors > 0) {
+    if (have_acl && jcr->acl_data->nr_errors > 0) {
        Jmsg(jcr, M_ERROR, 0, _("Encountered %ld acl errors while doing backup\n"),
-            jcr->total_acl_errors);
+            jcr->acl_data->nr_errors);
     }
-    if (jcr->total_xattr_errors > 0) {
+    if (have_xattr && jcr->xattr_data->nr_errors > 0) {
        Jmsg(jcr, M_ERROR, 0, _("Encountered %ld xattr errors while doing backup\n"),
-            jcr->total_xattr_errors);
+            jcr->xattr_data->nr_errors);
     }
  
 -   accurate_send_deleted_list(jcr);              /* send deleted list to SD  */
 +   accurate_finish(jcr);              /* send deleted or base file list to SD */
  
     stop_heartbeat_monitor(jcr);
  

diff --cc bacula/src/filed/job.c
Simple merge

diff --cc bacula/src/findlib/find.c
Simple merge

diff --cc bacula/src/jcr.h
Simple merge