From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 23 Oct 2015 15:39:56 +0000 (+0200)
Subject: Fix #1368 about xattr error not displayed correctly at restore time
X-Git-Tag: Release-7.4.0~188
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0340f1811cc9f84889bae33e89ce278092d81ae2;p=bacula%2Fbacula

Fix #1368 about xattr error not displayed correctly at restore time
---

diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c
index 9240544654..67623481fa 100644
--- a/bacula/src/filed/xattr.c
+++ b/bacula/src/filed/xattr.c
@@ -559,11 +559,11 @@ static bxattr_rtn_code aix_restore_xattr_streams(JCR *jcr, int stream, char *con
              * change from one filesystem to an other.
              */
             jcr->xattr_ctx->flags &= ~BXATTR_FLAG_RESTORE_NATIVE;
-            break;
+            /* Failback wanted */
          default:
-            Mmsg2(jcr->errmsg, _("XATTR lsetea error on file \"%s\": ERR=%s\n"),
-                  jcr->last_fname, be.bstrerror());
-            Dmsg1(100, "%s", jcr->errmsg);
+            MmsgD2(100, jcr->errmsg,
+                   _("XATTR lsetea error on file \"%s\": ERR=%s\n"),
+                   jcr->last_fname, be.bstrerror());
             break;
          }
          goto get_out;
@@ -1298,11 +1298,10 @@ static bxattr_rtn_code generic_restore_xattr_streams(JCR *jcr, int stream,
              * change from one filesystem to an other.
              */
             jcr->xattr_ctx->flags &= ~BXATTR_FLAG_RESTORE_NATIVE;
-         } else {
-            Mmsg2(jcr->errmsg, _("lsetxattr error on file \"%s\": ERR=%s\n"),
-                  jcr->last_fname, be.bstrerror());
-            Dmsg1(100, "%s", jcr->errmsg);
          }
+         MmsgD2(100, jcr->errmsg,
+                _("lsetxattr error on file \"%s\": ERR=%s\n"),
+                jcr->last_fname, be.bstrerror());
          goto get_out;
       }
    }