ebl Rename all STREAM_ACL_..._T into STREAM_ACL_..

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8136 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index d7b04ac988159cbd723108a2283f47171ad4a268..44492886e748c9d290691d7dbbcaa82ca275a703 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -255,43 +255,43 @@ void InitWinAPIWrapper();
  * 1999 down. So the two naming spaces grows towards each other.
  */
 #define STREAM_ACL_AIX_TEXT                1000    /* AIX specific string representation from acl_get */
-#define STREAM_ACL_DARWIN_ACCESS_ACL_T     1001    /* Darwin (OSX) specific acl_t string representation
+#define STREAM_ACL_DARWIN_ACCESS_ACL     1001    /* Darwin (OSX) specific acl_t string representation
                                                     * from acl_to_text (POSIX acl)
                                                     */
-#define STREAM_ACL_FREEBSD_DEFAULT_ACL_T   1002    /* FreeBSD specific acl_t string representation
+#define STREAM_ACL_FREEBSD_DEFAULT_ACL   1002    /* FreeBSD specific acl_t string representation
                                                     * from acl_to_text (POSIX acl) for default acls.
                                                     */
-#define STREAM_ACL_FREEBSD_ACCESS_ACL_T    1003    /* FreeBSD specific acl_t string representation
+#define STREAM_ACL_FREEBSD_ACCESS_ACL    1003    /* FreeBSD specific acl_t string representation
                                                     * from acl_to_text (POSIX acl) for access acls.
                                                     */
 #define STREAM_ACL_HPUX_ACL_ENTRY          1004    /* HPUX specific acl_entry string representation
                                                     * from acltostr (POSIX acl)
                                                     */
-#define STREAM_ACL_IRIX_DEFAULT_ACL_T      1005    /* IRIX specific acl_t string representation
+#define STREAM_ACL_IRIX_DEFAULT_ACL      1005    /* IRIX specific acl_t string representation
                                                     * from acl_to_text (POSIX acl) for default acls.
                                                     */
-#define STREAM_ACL_IRIX_ACCESS_ACL_T       1006    /* IRIX specific acl_t string representation
+#define STREAM_ACL_IRIX_ACCESS_ACL       1006    /* IRIX specific acl_t string representation
                                                     * from acl_to_text (POSIX acl) for access acls.
                                                     */
-#define STREAM_ACL_LINUX_DEFAULT_ACL_T     1007    /* Linux specific acl_t string representation
+#define STREAM_ACL_LINUX_DEFAULT_ACL     1007    /* Linux specific acl_t string representation
                                                     * from acl_to_text (POSIX acl) for default acls.
                                                     */
-#define STREAM_ACL_LINUX_ACCESS_ACL_T      1008    /* Linux specific acl_t string representation
+#define STREAM_ACL_LINUX_ACCESS_ACL      1008    /* Linux specific acl_t string representation
                                                     * from acl_to_text (POSIX acl) for access acls.
                                                     */
-#define STREAM_ACL_TRU64_DEFAULT_ACL_T     1009    /* Tru64 specific acl_t string representation
+#define STREAM_ACL_TRU64_DEFAULT_ACL     1009    /* Tru64 specific acl_t string representation
                                                     * from acl_to_text (POSIX acl) for default acls.
                                                     */
-#define STREAM_ACL_TRU64_DEFAULT_DIR_ACL_T 1010    /* Tru64 specific acl_t string representation
+#define STREAM_ACL_TRU64_DEFAULT_DIR_ACL 1010    /* Tru64 specific acl_t string representation
                                                     * from acl_to_text (POSIX acl) for default acls.
                                                     */
-#define STREAM_ACL_TRU64_ACCESS_ACL_T      1011    /* Tru64 specific acl_t string representation
+#define STREAM_ACL_TRU64_ACCESS_ACL      1011    /* Tru64 specific acl_t string representation
                                                     * from acl_to_text (POSIX acl) for access acls.
                                                     */
-#define STREAM_ACL_SOLARIS_ACLENT_T        1012    /* Solaris specific aclent_t string representation
+#define STREAM_ACL_SOLARIS_ACLENT        1012    /* Solaris specific aclent_t string representation
                                                     * from acltotext or acl_totext (POSIX acl)
                                                     */
-#define STREAM_ACL_SOLARIS_ACE_T           1013    /* Solaris specific ace_t string representation from
+#define STREAM_ACL_SOLARIS_ACE           1013    /* Solaris specific ace_t string representation from
                                                     * from acl_totext (NFSv4 or ZFS acl)
                                                     */
 #define STREAM_XATTR_DARWIN                1996    /* Darwin (OSX) specific extended attributes */

diff --git a/bacula/src/filed/acl.c b/bacula/src/filed/acl.c
index bb1130b42648b57cac436583188db6b5d136cf7b..11b8ea47d3f7af7219c9013d9dcb8cccf1c789a9 100644 (file)
--- a/bacula/src/filed/acl.c
+++ b/bacula/src/filed/acl.c
@@ -527,7 +527,7 @@ static bool darwin_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
       return false;
 
    if (len > 0) {
-      if (!send_acl_stream(jcr, STREAM_ACL_DARWIN_ACCESS_ACL_T, len))
+      if (!send_acl_stream(jcr, STREAM_ACL_DARWIN_ACCESS_ACL, len))
          return false;
    }
 #endif
@@ -539,7 +539,7 @@ static bool darwin_parse_acl_stream(JCR *jcr, int stream)
 {
    switch (stream) {
    case STREAM_UNIX_ACCESS_ACL:
-   case STREAM_ACL_DARWIN_ACCESS_ACL_T:
+   case STREAM_ACL_DARWIN_ACCESS_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_ACCESS);
    }
 
@@ -557,7 +557,7 @@ static bool freebsd_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
       return false;
 
    if (len > 0) {
-      if (!send_acl_stream(jcr, STREAM_ACL_FREEBSD_ACCESS_ACL_T, len))
+      if (!send_acl_stream(jcr, STREAM_ACL_FREEBSD_ACCESS_ACL, len))
          return false;
    }
 
@@ -569,7 +569,7 @@ static bool freebsd_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
          return false;
 
       if (len > 0) {
-         if (!send_acl_stream(jcr, STREAM_ACL_FREEBSD_DEFAULT_ACL_T, len))
+         if (!send_acl_stream(jcr, STREAM_ACL_FREEBSD_DEFAULT_ACL, len))
             return false;
       }
    }
@@ -581,10 +581,10 @@ static bool freebsd_parse_acl_stream(JCR *jcr, int stream)
 {
    switch (stream) {
    case STREAM_UNIX_ACCESS_ACL:
-   case STREAM_ACL_FREEBSD_ACCESS_ACL_T:
+   case STREAM_ACL_FREEBSD_ACCESS_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_ACCESS);
    case STREAM_UNIX_DEFAULT_ACL:
-   case STREAM_ACL_FREEBSD_DEFAULT_ACL_T:
+   case STREAM_ACL_FREEBSD_DEFAULT_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_DEFAULT);
    }
 
@@ -602,7 +602,7 @@ static bool irix_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
       return false;
 
    if (len > 0) {
-      if (!send_acl_stream(jcr, STREAM_ACL_IRIX_ACCESS_ACL_T, len))
+      if (!send_acl_stream(jcr, STREAM_ACL_IRIX_ACCESS_ACL, len))
          return false;
    }
 
@@ -614,7 +614,7 @@ static bool irix_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
          return false;
 
       if (len > 0) {
-         if (!send_acl_stream(jcr, STREAM_ACL_IRIX_DEFAULT_ACL_T, len))
+         if (!send_acl_stream(jcr, STREAM_ACL_IRIX_DEFAULT_ACL, len))
             return false;
       }
    }
@@ -626,10 +626,10 @@ static bool irix_parse_acl_stream(JCR *jcr, int stream)
 {
    switch (stream) {
    case STREAM_UNIX_ACCESS_ACL:
-   case STREAM_ACL_IRIX_ACCESS_ACL_T:
+   case STREAM_ACL_IRIX_ACCESS_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_ACCESS);
    case STREAM_UNIX_DEFAULT_ACL:
-   case STREAM_ACL_IRIX_DEFAULT_ACL_T:
+   case STREAM_ACL_IRIX_DEFAULT_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_DEFAULT);
    }
 
@@ -647,7 +647,7 @@ static bool linux_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
       return false;
 
    if (len > 0) {
-      if (!send_acl_stream(jcr, STREAM_ACL_LINUX_ACCESS_ACL_T, len))
+      if (!send_acl_stream(jcr, STREAM_ACL_LINUX_ACCESS_ACL, len))
          return false;
    }
 
@@ -659,7 +659,7 @@ static bool linux_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
          return false;
 
       if (len > 0) {
-         if (!send_acl_stream(jcr, STREAM_ACL_LINUX_DEFAULT_ACL_T, len))
+         if (!send_acl_stream(jcr, STREAM_ACL_LINUX_DEFAULT_ACL, len))
             return false;
       }
    }
@@ -671,10 +671,10 @@ static bool linux_parse_acl_stream(JCR *jcr, int stream)
 {
    switch (stream) {
    case STREAM_UNIX_ACCESS_ACL:
-   case STREAM_ACL_LINUX_ACCESS_ACL_T:
+   case STREAM_ACL_LINUX_ACCESS_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_ACCESS);
    case STREAM_UNIX_DEFAULT_ACL:
-   case STREAM_ACL_LINUX_DEFAULT_ACL_T:
+   case STREAM_ACL_LINUX_DEFAULT_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_DEFAULT);
    }
 
@@ -692,7 +692,7 @@ static bool tru64_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
       return false;
 
    if (len > 0) {
-      if (!send_acl_stream(jcr, STREAM_ACL_TRU64_ACCESS_ACL_T, len))
+      if (!send_acl_stream(jcr, STREAM_ACL_TRU64_ACCESS_ACL, len))
          return false;
    }
 
@@ -704,7 +704,7 @@ static bool tru64_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
          return false;
 
       if (len > 0) {
-         if (!send_acl_stream(jcr, STREAM_ACL_TRU64_DEFAULT_ACL_T, len))
+         if (!send_acl_stream(jcr, STREAM_ACL_TRU64_DEFAULT_ACL, len))
             return false;
       }
 
@@ -718,7 +718,7 @@ static bool tru64_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
          return false;
 
       if (len > 0) {
-         if (!send_acl_stream(jcr, STREAM_ACL_TRU64_DEFAULT_DIR_ACL_T, len))
+         if (!send_acl_stream(jcr, STREAM_ACL_TRU64_DEFAULT_DIR_ACL, len))
             return false;
       }
    }
@@ -730,12 +730,12 @@ static bool tru64_parse_acl_stream(JCR *jcr, int stream)
 {
    switch (stream) {
    case STREAM_UNIX_ACCESS_ACL:
-   case STREAM_ACL_TRU64_ACCESS_ACL_T:
+   case STREAM_ACL_TRU64_ACCESS_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_ACCESS);
    case STREAM_UNIX_DEFAULT_ACL:
-   case STREAM_ACL_TRU64_DEFAULT_ACL_T:
+   case STREAM_ACL_TRU64_DEFAULT_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_DEFAULT);
-   case STREAM_ACL_TRU64_DEFAULT_DIR_ACL_T:
+   case STREAM_ACL_TRU64_DEFAULT_DIR_ACL:
       return generic_set_acl_on_os(jcr, BACL_TYPE_DEFAULT_DIR);
 }
 #endif
@@ -976,10 +976,10 @@ static bool solaris_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
 
       switch (acl_type(aclp)) {
       case ACLENT_T:
-         stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACLENT_T, len);
+         stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACLENT, len);
          break;
       case ACE_T:
-         stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACE_T, len);
+         stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACE, len);
          break;
       default:
          break;
@@ -998,8 +998,8 @@ static bool solaris_parse_acl_stream(JCR *jcr, int stream)
 
    switch (stream) {
    case STREAM_UNIX_ACCESS_ACL:
-   case STREAM_ACL_SOLARIS_ACLENT_T:
-   case STREAM_ACL_SOLARIS_ACE_T:
+   case STREAM_ACL_SOLARIS_ACLENT:
+   case STREAM_ACL_SOLARIS_ACE:
       if ((error = acl_fromtext(jcr->acl_data, &aclp)) != 0) {
          Jmsg2(jcr, M_ERROR, 0, _("acl_fromtext error on file \"%s\": ERR=%s\n"),
             jcr->last_fname, acl_strerror(error));
@@ -1012,13 +1012,13 @@ static bool solaris_parse_acl_stream(JCR *jcr, int stream)
        * Validate that the conversion gave us the correct acl type.
        */
       switch (stream) {
-      case STREAM_ACL_SOLARIS_ACLENT_T:
+      case STREAM_ACL_SOLARIS_ACLENT:
          if (acl_type(aclp) != ACLENT_T) {
             Jmsg1(jcr, M_ERROR, 0, _("wrong encoding of acl type in acl stream on file \"%s\"\n"),
                jcr->last_fname);
             return false;
          }
-      case STREAM_ACL_SOLARIS_ACE_T:
+      case STREAM_ACL_SOLARIS_ACE:
          if (acl_type(aclp) != ACE_T) {
             Jmsg1(jcr, M_ERROR, 0, _("wrong encoding of acl type in acl stream on file \"%s\"\n"),
                jcr->last_fname);
@@ -1108,7 +1108,7 @@ static bool solaris_build_acl_streams(JCR *jcr, FF_PKT *ff_pkt);
          actuallyfree(acl_text);
          free(acls);
 
-         return send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACLENT_T, len);
+         return send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACLENT, len);
       }
 
       berrno be;
@@ -1210,13 +1210,13 @@ bool parse_acl_stream(JCR *jcr, int stream)
       return aix_parse_acl_stream(jcr, stream);
 #elif defined(HAVE_DARWIN_OS)
    case STREAM_UNIX_ACCESS_ACL:
-   case STREAM_ACL_DARWIN_ACCESS_ACL_T:
+   case STREAM_ACL_DARWIN_ACCESS_ACL:
       return darwin_parse_acl_stream(jcr, stream);
 #elif defined(HAVE_FREEBSD_OS)
    case STREAM_UNIX_ACCESS_ACL:
    case STREAM_UNIX_DEFAULT_ACL:
-   case STREAM_ACL_FREEBSD_DEFAULT_ACL_T:
-   case STREAM_ACL_FREEBSD_ACCESS_ACL_T:
+   case STREAM_ACL_FREEBSD_DEFAULT_ACL:
+   case STREAM_ACL_FREEBSD_ACCESS_ACL:
       return freebsd_parse_acl_stream(jcr, stream);
 #elif defined(HAVE_HPUX_OS)
    case STREAM_UNIX_ACCESS_ACL:
@@ -1225,27 +1225,27 @@ bool parse_acl_stream(JCR *jcr, int stream)
 #elif defined(HAVE_IRIX_OS)
    case STREAM_UNIX_ACCESS_ACL:
    case STREAM_UNIX_DEFAULT_ACL:
-   case STREAM_ACL_IRIX_DEFAULT_ACL_T:
-   case STREAM_ACL_IRIX_ACCESS_ACL_T:
+   case STREAM_ACL_IRIX_DEFAULT_ACL:
+   case STREAM_ACL_IRIX_ACCESS_ACL:
       return irix_parse_acl_stream(jcr, stream);
 #elif defined(HAVE_LINUX_OS)
    case STREAM_UNIX_ACCESS_ACL:
    case STREAM_UNIX_DEFAULT_ACL:
-   case STREAM_ACL_LINUX_DEFAULT_ACL_T:
-   case STREAM_ACL_LINUX_ACCESS_ACL_T:
+   case STREAM_ACL_LINUX_DEFAULT_ACL:
+   case STREAM_ACL_LINUX_ACCESS_ACL:
       return linux_parse_acl_stream(jcr, stream);
 #elif defined(HAVE_OSF1_OS)
    case STREAM_UNIX_ACCESS_ACL:
    case STREAM_UNIX_DEFAULT_ACL:
-   case STREAM_ACL_TRU64_DEFAULT_ACL_T:
-   case STREAM_ACL_TRU64_ACCESS_ACL_T:
-   case STREAM_ACL_TRU64_DEFAULT_DIR_ACL_T:
+   case STREAM_ACL_TRU64_DEFAULT_ACL:
+   case STREAM_ACL_TRU64_ACCESS_ACL:
+   case STREAM_ACL_TRU64_DEFAULT_DIR_ACL:
       return tru64_parse_acl_stream(jcr, stream);
 #elif defined(HAVE_SUN_OS)
    case STREAM_UNIX_ACCESS_ACL:
-   case STREAM_ACL_SOLARIS_ACLENT_T:
+   case STREAM_ACL_SOLARIS_ACLENT:
 #if defined(HAVE_EXTENDED_ACL)
-   case STREAM_ACL_SOLARIS_ACE_T:
+   case STREAM_ACL_SOLARIS_ACE:
 #endif
       return solaris_parse_acl_stream(jcr, stream);
 #endif

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index eba51ce3fa9fd3aadf799a70bd119d24f580ea46..1ec7dfaa10a76851041e92b9dab3066daa181329 100644 (file)
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -580,19 +580,19 @@ void do_restore(JCR *jcr)
       case STREAM_UNIX_ACCESS_ACL:
       case STREAM_UNIX_DEFAULT_ACL:
       case STREAM_ACL_AIX_TEXT:
-      case STREAM_ACL_DARWIN_ACCESS_ACL_T:
-      case STREAM_ACL_FREEBSD_DEFAULT_ACL_T:
-      case STREAM_ACL_FREEBSD_ACCESS_ACL_T:
+      case STREAM_ACL_DARWIN_ACCESS_ACL:
+      case STREAM_ACL_FREEBSD_DEFAULT_ACL:
+      case STREAM_ACL_FREEBSD_ACCESS_ACL:
       case STREAM_ACL_HPUX_ACL_ENTRY:
-      case STREAM_ACL_IRIX_DEFAULT_ACL_T:
-      case STREAM_ACL_IRIX_ACCESS_ACL_T:
-      case STREAM_ACL_LINUX_DEFAULT_ACL_T:
-      case STREAM_ACL_LINUX_ACCESS_ACL_T:
-      case STREAM_ACL_TRU64_DEFAULT_ACL_T:
-      case STREAM_ACL_TRU64_DEFAULT_DIR_ACL_T:
-      case STREAM_ACL_TRU64_ACCESS_ACL_T:
-      case STREAM_ACL_SOLARIS_ACLENT_T:
-      case STREAM_ACL_SOLARIS_ACE_T:
+      case STREAM_ACL_IRIX_DEFAULT_ACL:
+      case STREAM_ACL_IRIX_ACCESS_ACL:
+      case STREAM_ACL_LINUX_DEFAULT_ACL:
+      case STREAM_ACL_LINUX_ACCESS_ACL:
+      case STREAM_ACL_TRU64_DEFAULT_ACL:
+      case STREAM_ACL_TRU64_DEFAULT_DIR_ACL:
+      case STREAM_ACL_TRU64_ACCESS_ACL:
+      case STREAM_ACL_SOLARIS_ACLENT:
+      case STREAM_ACL_SOLARIS_ACE:
          /*
           * 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 eafaf6c17fc881776df84a73f359e86474cfc2d4..f7a65f0b2b007cb83ca00a13899f731efacd7025 100644 (file)
--- a/bacula/src/findlib/bfile.c
+++ b/bacula/src/findlib/bfile.c
@@ -145,29 +145,29 @@ const char *stream_to_ascii(int stream)
       return _("Encrypted MacOS fork data");
    case STREAM_ACL_AIX_TEXT:
       return _("AIX Specific ACL attribs");
-   case STREAM_ACL_DARWIN_ACCESS_ACL_T:
+   case STREAM_ACL_DARWIN_ACCESS_ACL:
       return _("Darwin Specific ACL attribs");
-   case STREAM_ACL_FREEBSD_DEFAULT_ACL_T:
+   case STREAM_ACL_FREEBSD_DEFAULT_ACL:
       return _("FreeBSD Specific Default ACL attribs");
-   case STREAM_ACL_FREEBSD_ACCESS_ACL_T:
+   case STREAM_ACL_FREEBSD_ACCESS_ACL:
       return _("FreeBSD Specific Access ACL attribs");
    case STREAM_ACL_HPUX_ACL_ENTRY:
       return _("HPUX Specific ACL attribs");
-   case STREAM_ACL_IRIX_DEFAULT_ACL_T:
+   case STREAM_ACL_IRIX_DEFAULT_ACL:
       return _("Irix Specific Default ACL attribs");
-   case STREAM_ACL_IRIX_ACCESS_ACL_T:
+   case STREAM_ACL_IRIX_ACCESS_ACL:
       return _("Irix Specific Access ACL attribs");
-   case STREAM_ACL_LINUX_DEFAULT_ACL_T:
+   case STREAM_ACL_LINUX_DEFAULT_ACL:
       return _("Linux Specific Default ACL attribs");
-   case STREAM_ACL_LINUX_ACCESS_ACL_T:
+   case STREAM_ACL_LINUX_ACCESS_ACL:
       return _("Linux Specific Access ACL attribs");
-   case STREAM_ACL_TRU64_DEFAULT_ACL_T:
+   case STREAM_ACL_TRU64_DEFAULT_ACL:
       return _("OSF1 Specific Default ACL attribs");
-   case STREAM_ACL_TRU64_ACCESS_ACL_T:
+   case STREAM_ACL_TRU64_ACCESS_ACL:
       return _("OSF1 Specific Access ACL attribs");
-   case STREAM_ACL_SOLARIS_ACLENT_T:
+   case STREAM_ACL_SOLARIS_ACLENT:
       return _("Solaris Specific ACL attribs");
-   case STREAM_ACL_SOLARIS_ACE_T:
+   case STREAM_ACL_SOLARIS_ACE:
       return _("Solaris Specific ACL attribs");
    case STREAM_XATTR_DARWIN:
       return _("Darwin Specific Extended attribs");

diff --git a/bacula/src/stored/bscan.c b/bacula/src/stored/bscan.c
index 2dd620b683534ab773ca4d27afc453b182f2ae34..cf21278592498bcc595bf007d8aaabfeccaa2eba 100644 (file)
--- a/bacula/src/stored/bscan.c
+++ b/bacula/src/stored/bscan.c
@@ -794,19 +794,19 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
    case STREAM_UNIX_ACCESS_ACL:          /* Deprecated Standard ACL attributes on UNIX */
    case STREAM_UNIX_DEFAULT_ACL:         /* Deprecated Default ACL attributes on UNIX */
    case STREAM_ACL_AIX_TEXT:
-   case STREAM_ACL_DARWIN_ACCESS_ACL_T:
-   case STREAM_ACL_FREEBSD_DEFAULT_ACL_T:
-   case STREAM_ACL_FREEBSD_ACCESS_ACL_T:
+   case STREAM_ACL_DARWIN_ACCESS_ACL:
+   case STREAM_ACL_FREEBSD_DEFAULT_ACL:
+   case STREAM_ACL_FREEBSD_ACCESS_ACL:
    case STREAM_ACL_HPUX_ACL_ENTRY:
-   case STREAM_ACL_IRIX_DEFAULT_ACL_T:
-   case STREAM_ACL_IRIX_ACCESS_ACL_T:
-   case STREAM_ACL_LINUX_DEFAULT_ACL_T:
-   case STREAM_ACL_LINUX_ACCESS_ACL_T:
-   case STREAM_ACL_TRU64_DEFAULT_ACL_T:
-   case STREAM_ACL_TRU64_DEFAULT_DIR_ACL_T:
-   case STREAM_ACL_TRU64_ACCESS_ACL_T:
-   case STREAM_ACL_SOLARIS_ACLENT_T:
-   case STREAM_ACL_SOLARIS_ACE_T:
+   case STREAM_ACL_IRIX_DEFAULT_ACL:
+   case STREAM_ACL_IRIX_ACCESS_ACL:
+   case STREAM_ACL_LINUX_DEFAULT_ACL:
+   case STREAM_ACL_LINUX_ACCESS_ACL:
+   case STREAM_ACL_TRU64_DEFAULT_ACL:
+   case STREAM_ACL_TRU64_DEFAULT_DIR_ACL:
+   case STREAM_ACL_TRU64_ACCESS_ACL:
+   case STREAM_ACL_SOLARIS_ACLENT:
+   case STREAM_ACL_SOLARIS_ACE:
       /* Ignore Unix ACL attributes */
       break;
 

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 47510f6a715e420ebfb3668187b36f2ab99fda8e..ee1a0e4c7f66ae321106b566345c8d5333a56737 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -10,6 +10,8 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+10Dec08
+ebl  Rename all STREAM_ACL_..._T into STREAM_ACL_..
 09Dec08
 ebl  Add a new lock manager that can detect deadlock situation
      This new option is activated with a --enable-lockmgr configure