Tweak fix MySQL quoting again :-(

[bacula/bacula] / bacula / src / filed / acl.c

diff --git a/bacula/src/filed/acl.c b/bacula/src/filed/acl.c
index d3a4d2dcda10874ad70ec089e0dfba3411a5af36..d3aac220f08054952e1c0539056a40f2f5c1bfd4 100644 (file)
--- a/bacula/src/filed/acl.c
+++ b/bacula/src/filed/acl.c
@@ -324,7 +324,10 @@ static bacl_exit_code aix_parse_acl_streams(JCR *jcr, int stream)
              */
             switch (errno) {
             case ENOSPC:
-               continue;
+               if (cnt < 3) {
+                  continue;
+               }
+               /* FALL THROUGH */
             default:
                Mmsg2(jcr->errmsg, _("aclx_scanStr error on file \"%s\": ERR=%s\n"),
                      jcr->last_fname, be.bstrerror());
@@ -404,7 +407,7 @@ static bacl_exit_code (*os_parse_acl_streams)(JCR *jcr, int stream) = aix_parse_
 #elif defined(HAVE_DARWIN_OS) || \
       defined(HAVE_FREEBSD_OS) || \
       defined(HAVE_IRIX_OS) || \
-      defined(HAVE_TRU64_OS) || \
+      defined(HAVE_OSF1_OS) || \
       defined(HAVE_LINUX_OS)
 
 #include <sys/types.h>
@@ -534,7 +537,7 @@ static bool acl_is_trivial(acl_t acl)
          return false;
    }
    return true;
-#elif defined(HAVE_TRU64_OS)
+#elif defined(HAVE_OSF1_OS)
    int count;
 
    ace = acl->acl_first;
@@ -879,7 +882,7 @@ static bacl_exit_code generic_parse_acl_streams(JCR *jcr, int stream)
 static bacl_exit_code (*os_build_acl_streams)(JCR *jcr, FF_PKT *ff_pkt) = generic_build_acl_streams;
 static bacl_exit_code (*os_parse_acl_streams)(JCR *jcr, int stream) = generic_parse_acl_streams;
 
-#elif defined(HAVE_TRU64_OS)
+#elif defined(HAVE_OSF1_OS)
 
 /**
  * Define the supported ACL streams for this OS