From 8ae3c330bd07df91c563fe8a179b163442d176d1 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sat, 15 Aug 2009 10:05:55 +0200 Subject: [PATCH] fix couple of segfault in acl/xattr code --- bacula/src/filed/backup.c | 4 ++-- bacula/src/filed/restore.c | 4 ++-- bacula/technotes | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c index 87f6556409..f46b2c304b 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -158,11 +158,11 @@ bool blast_data_to_storage_daemon(JCR *jcr, char *addr) set_jcr_job_status(jcr, JS_ErrorTerminated); } - if (jcr->acl_data->nr_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->acl_data->nr_errors); } - if (jcr->xattr_data->nr_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->xattr_data->nr_errors); } diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c index 470dbb08e0..808daec84b 100644 --- a/bacula/src/filed/restore.c +++ b/bacula/src/filed/restore.c @@ -738,11 +738,11 @@ ok_out: */ Dmsg2(10, "End Do Restore. Files=%d Bytes=%s\n", jcr->JobFiles, edit_uint64(jcr->JobBytes, ec1)); - if (jcr->acl_data->nr_errors > 0) { + if (have_acl && jcr->acl_data->nr_errors > 0) { Jmsg(jcr, M_ERROR, 0, _("Encountered %ld acl errors while doing restore\n"), jcr->acl_data->nr_errors); } - if (jcr->xattr_data->nr_errors > 0) { + if (have_xattr && jcr->xattr_data->nr_errors > 0) { Jmsg(jcr, M_ERROR, 0, _("Encountered %ld xattr errors while doing restore\n"), jcr->xattr_data->nr_errors); } diff --git a/bacula/technotes b/bacula/technotes index ed456455f6..e5f68c2b7d 100644 --- a/bacula/technotes +++ b/bacula/technotes @@ -2,6 +2,8 @@ General: +15Aug09 +ebl Fix couple of segfault with new ACL/XATTR code 13Aug09 ebl update lock manager to display file:line all the time kes Make SD lock tracing work again. Has not worked for some time. -- 2.39.5