From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 24 Aug 2009 13:30:36 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-5.0.0~332
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1c437d233e8e669c5b5df8d8dfc957dee4993dad;p=bacula%2Fbacula

Merge branch 'master' into basejobv3
---

1c437d233e8e669c5b5df8d8dfc957dee4993dad
diff --cc bacula/src/filed/backup.c
index e92f880b4f,f46b2c304b..83b6050861
--- a/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);