From: Eric Bollengier <eric@baculasystems.com>
Date: Tue, 28 Aug 2012 12:15:02 +0000 (+0200)
Subject: Do not try to strip RestoreObject during attribute encoding
X-Git-Tag: Release-7.0.0~95
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0ae81bc5d099404d07328f1c7120d11f49ad5957;p=bacula%2Fbacula

Do not try to strip RestoreObject during attribute encoding
---

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 3a42799eb9..da9330feff 100644
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -1352,7 +1352,7 @@ bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream)
     * For a directory, link is the same as fname, but with trailing
     * slash. For a linked file, link is the link.
     */
-   if (ff_pkt->type != FT_DELETED) { /* already stripped */
+   if (!IS_FT_OBJECT(ff_pkt->type) && ff_pkt->type != FT_DELETED) { /* already stripped */
       strip_path(ff_pkt);
    }
    switch (ff_pkt->type) {
@@ -1414,7 +1414,8 @@ bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream)
                        attribsEx, 0, ff_pkt->delta_seq, 0);
       break;
    }
-   if (ff_pkt->type != FT_DELETED) {
+
+   if (!IS_FT_OBJECT(ff_pkt->type) && ff_pkt->type != FT_DELETED) {
       unstrip_path(ff_pkt);
    }