From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 14 Aug 2009 12:37:44 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-5.0.0~333
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aa941b9e61a7944ac6ad87d4adc82c099dedf2b3;p=bacula%2Fbacula

Merge branch 'master' into basejobv3

Conflicts:
	bacula/src/filed/backup.c
---

aa941b9e61a7944ac6ad87d4adc82c099dedf2b3
diff --cc bacula/src/filed/backup.c
index 1721199ea0,54f42f9613..e92f880b4f
--- a/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);
     }
  
+    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_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/protos.h
index eb48006283,4c426923d0..9ac0afbeeb
--- a/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);