Merge branch 'master' into basejobv3

Conflicts:
	bacula/src/filed/backup.c

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

diff --cc bacula/src/dird/dird_conf.c
Simple merge

diff --cc bacula/src/filed/backup.c
index 1721199ea0495b861bc5db36110de9aecef8ea5e,54f42f96131f60520bc0a2f190f504603fd9cd24..e92f880b4f7d7102f47ffd6629c70fbcfc3a51b6
--- 1/bacula/src/filed/backup.c
--- 2/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@@ -153,7 -155,16 +155,16 @@@ bool blast_data_to_storage_daemon(JCR *
        set_jcr_job_status(jcr, JS_ErrorTerminated);
     }
  
 -   accurate_send_deleted_list(jcr);              /* send deleted list to SD  */
+    if (jcr->total_acl_errors > 0) {
+       Jmsg(jcr, M_ERROR, 0, _("Encountered %ld acl errors while doing backup\n"),
+            jcr->total_acl_errors);
+    }
+    if (jcr->total_xattr_errors > 0) {
+       Jmsg(jcr, M_ERROR, 0, _("Encountered %ld xattr errors while doing backup\n"),
+            jcr->total_xattr_errors);
+    }
+ 
 +   accurate_finish(jcr);              /* send deleted or base file list to SD */
  
     stop_heartbeat_monitor(jcr);
  

diff --cc bacula/src/filed/protos.h
index eb480062838894bc5601596b2d4a19d06debd51a,4c426923d04de3c5a467d96e691490bc79f4ef95..9ac0afbeeb2f1d9f54a54572bf771f5686893b4a
--- 1/bacula/src/filed/protos.h
--- 2/bacula/src/filed/protos.h
+++ b/bacula/src/filed/protos.h
@@@ -47,11 -47,11 +47,11 @@@ void start_dir_heartbeat(JCR *jcr)
  void stop_dir_heartbeat(JCR *jcr);
  
  /* From acl.c */
- bool build_acl_streams(JCR *jcr, FF_PKT *ff_pkt);
- bool parse_acl_stream(JCR *jcr, int stream);
+ bacl_exit_code build_acl_streams(JCR *jcr, FF_PKT *ff_pkt);
+ bacl_exit_code parse_acl_streams(JCR *jcr, int stream);
  
  /* from accurate.c */
 -bool accurate_send_deleted_list(JCR *jcr);
 +bool accurate_finish(JCR *jcr);
  bool accurate_check_file(JCR *jcr, FF_PKT *ff_pkt);
  bool accurate_mark_file_as_seen(JCR *jcr, char *fname);
  void accurate_free(JCR *jcr);

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