fix couple of segfault in acl/xattr code

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 87f6556409452d8a2072f32308bc74f18c63093f..f46b2c304bb7631884282be4dddd3df9695ac7ab 100644 (file)
--- 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 470dbb08e0e0379e0ea269ec98cea2541f7b9b98..808daec84b14a4f5b3867cf85888134df2d57b68 100644 (file)
--- 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 ed456455f6d8ba95daba88c5ec4db499006e9584..e5f68c2b7da46cb3fd4f98d59bc9e9856469275e 100644 (file)
--- 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.