From 9d163a39ceb302a2545d708a9b3cc28d3ed88832 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 12 Jan 2009 10:57:58 +0000
Subject: [PATCH] Apply Eric's fix for suppressing extended attributes error
 messages      when dealing with deleted files.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8361 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/findlib/attribs.c | 13 +++++++------
 bacula/src/version.h         |  6 +++---
 bacula/technotes-2.5         |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bacula/src/findlib/attribs.c b/bacula/src/findlib/attribs.c
index 09996630a3..c9f8521998 100644
--- a/bacula/src/findlib/attribs.c
+++ b/bacula/src/findlib/attribs.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2002-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -520,6 +520,11 @@ int encode_attribsEx(JCR *jcr, char *attribsEx, FF_PKT *ff_pkt)
     * restore, we can be sure we put back the whole resource.
     */
    char *p;
+
+   *attribsEx = 0;                 /* no extended attributes (yet) */
+   if (jcr->cmd_plugin || ff_pkt->type == FT_DELETED) {
+      return STREAM_UNIX_ATTRIBUTES;
+   }
    p = attribsEx;
    if (ff_pkt->flags & FO_HFSPLUS) {
       p += to_base64((uint64_t)(ff_pkt->hfsinfo.rsrclength), p);
@@ -551,11 +556,7 @@ int encode_attribsEx(JCR *jcr, char *attribsEx, FF_PKT *ff_pkt)
 
    attribsEx[0] = 0;                  /* no extended attributes */
 
-   if (jcr->cmd_plugin) {
-      return STREAM_UNIX_ATTRIBUTES;
-   }
-
-   if (ff_pkt->type == FT_DELETED) {  /* Don't check deleted files */
+   if (jcr->cmd_plugin || ff_pkt->type == FT_DELETED) {
       return STREAM_UNIX_ATTRIBUTES;
    }
 
diff --git a/bacula/src/version.h b/bacula/src/version.h
index de3ca1bcbd..2649cd93af 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.5.28-b1"
-#define BDATE   "04 January 2009"
-#define LSMDATE "04Jan09"
+#define VERSION "2.5.29"
+#define BDATE   "12 January 2009"
+#define LSMDATE "12Jan09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 25f7d82501..8538cd840d 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -11,7 +11,8 @@ mixed priorities
 
 General:
 12Jan09
-ebl  Fix warning message with Accurate mode on windows
+kes  Apply Eric's fix for suppressing extended attributes error messages
+     when dealing with deleted files.
 11Jan09
 kes  Add src/win32/newinstaller -- single file installer
 kes  Attempt to explicitly call gmake when needed, or if not found
-- 
2.39.5