From: Marco van Wieringen <mvw@planets.elm.net>
Date: Thu, 23 Sep 2010 14:31:49 +0000 (+0200)
Subject: Add missing new stream definitions.
X-Git-Tag: Release-7.0.0~1545
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c1f4dfba64bf9a0fa89cfd3b6aa363f53acfeb39;p=bacula%2Fbacula

Add missing new stream definitions.
---

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index 777470564c..0832b99be1 100644
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -652,6 +652,8 @@ void do_restore(JCR *jcr)
       case STREAM_ACL_SOLARIS_ACLENT:
       case STREAM_ACL_SOLARIS_ACE:
       case STREAM_ACL_AFS_TEXT:
+      case STREAM_ACL_AIX_AIXC:
+      case STREAM_ACL_AIX_NFS4:
          /*
           * Do not restore ACLs when
           * a) The current file is not extracted
diff --git a/bacula/src/findlib/bfile.c b/bacula/src/findlib/bfile.c
index 52e1895653..6d2d797c6f 100644
--- a/bacula/src/findlib/bfile.c
+++ b/bacula/src/findlib/bfile.c
@@ -167,6 +167,12 @@ const char *stream_to_ascii(int stream)
       return _("Solaris Specific ACL attribs");
    case STREAM_ACL_SOLARIS_ACE:
       return _("Solaris Specific ACL attribs");
+   case STREAM_ACL_AFS_TEXT:
+      return _("AFS Specific ACL attribs");
+   case STREAM_ACL_AIX_AIXC:
+      return _("AIX Specific ACL attribs");
+   case STREAM_ACL_AIX_NFS4:
+      return _("AIX Specific ACL attribs");
    case STREAM_XATTR_AIX:
       return _("AIX Specific Extended attribs");
    case STREAM_XATTR_OPENBSD:
diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index def0fb0ca3..5c487c29ee 100644
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -806,6 +806,9 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
    case STREAM_ACL_TRU64_ACCESS_ACL:
    case STREAM_ACL_SOLARIS_ACLENT:
    case STREAM_ACL_SOLARIS_ACE:
+   case STREAM_ACL_AFS_TEXT:
+   case STREAM_ACL_AIX_AIXC:
+   case STREAM_ACL_AIX_NFS4:
       /* Ignore Unix ACL attributes */
       break;