From: Marco van Wieringen <mvw@planets.elm.net>
Date: Thu, 11 Oct 2012 11:16:39 +0000 (+0200)
Subject: Tweak also allow restore of Hurd acl and xattr streams.
X-Git-Tag: Release-7.0.0~100
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=22a771060c8b01732bea13db08d02ae4b12f62f7;p=bacula%2Fbacula

Tweak also allow restore of Hurd acl and xattr streams.
---

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index fc22b375c2..96edcc808b 100644
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -302,11 +302,14 @@ static inline bool pop_delayed_data_streams(JCR *jcr, r_ctx &rctx)
       case STREAM_ACL_AIX_AIXC:
       case STREAM_ACL_AIX_NFS4:
       case STREAM_ACL_FREEBSD_NFS4_ACL:
+      case STREAM_ACL_HURD_DEFAULT_ACL:
+      case STREAM_ACL_HURD_ACCESS_ACL:
          if (!do_restore_acl(jcr, rds->stream, rds->content, rds->content_length)) {
             goto bail_out;
          }
          free(rds->content);
          break;
+      case STREAM_XATTR_HURD:
       case STREAM_XATTR_IRIX:
       case STREAM_XATTR_TRU64:
       case STREAM_XATTR_AIX:
@@ -892,6 +895,8 @@ void do_restore(JCR *jcr)
       case STREAM_ACL_AIX_AIXC:
       case STREAM_ACL_AIX_NFS4:
       case STREAM_ACL_FREEBSD_NFS4_ACL:
+      case STREAM_ACL_HURD_DEFAULT_ACL:
+      case STREAM_ACL_HURD_ACCESS_ACL:
          /*
           * Do not restore ACLs when
           * a) The current file is not extracted
@@ -920,6 +925,7 @@ void do_restore(JCR *jcr)
          }
          break;
 
+      case STREAM_XATTR_HURD:
       case STREAM_XATTR_IRIX:
       case STREAM_XATTR_TRU64:
       case STREAM_XATTR_AIX:
diff --git a/bacula/src/findlib/bfile.c b/bacula/src/findlib/bfile.c
index 0d4c1062af..e3156756c6 100644
--- a/bacula/src/findlib/bfile.c
+++ b/bacula/src/findlib/bfile.c
@@ -187,6 +187,12 @@ const char *stream_to_ascii(int stream)
       return _("AIX Specific NFSv4 ACL attribs");
    case STREAM_ACL_FREEBSD_NFS4_ACL:
       return _("FreeBSD Specific NFSv4/ZFS ACL attribs");
+   case STREAM_ACL_HURD_DEFAULT_ACL:
+      return _("GNU Hurd Specific Default ACL attribs");
+   case STREAM_ACL_HURD_ACCESS_ACL:
+      return _("GNU Hurd Specific Access ACL attribs");
+   case STREAM_XATTR_HURD:
+      return _("GNU Hurd Specific Extended attribs");
    case STREAM_XATTR_IRIX:
       return _("IRIX Specific Extended attribs");
    case STREAM_XATTR_TRU64:
diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index 93b118dc1c..d22560d9b1 100644
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -839,6 +839,8 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
    case STREAM_ACL_AIX_AIXC:
    case STREAM_ACL_AIX_NFS4:
    case STREAM_ACL_FREEBSD_NFS4_ACL:
+   case STREAM_ACL_HURD_DEFAULT_ACL:
+   case STREAM_ACL_HURD_ACCESS_ACL:
       /* Ignore Unix ACL attributes */
       break;