From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 6 Aug 2005 14:48:19 +0000 (+0000)
Subject: Apply David's ACL fix to src/filed/acl.c
X-Git-Tag: Release-7.0.0~8532
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eae67c1a2289aec91a00b88d3964004e0d5b1c79;p=bacula%2Fbacula

Apply David's ACL fix to src/filed/acl.c


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

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index f5d17059ca..ecf137b258 100644
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,8 @@
 General:
 
 Changes to 1.37.34:
+06Aug05
+- Apply David's ACL fix to src/filed/acl.c
 05Aug05
 - Apply patches sent by David Duchscher <kreios@gmail.com> for
   making ACLs work on MacOS X and FreeBSD.
diff --git a/bacula/src/filed/acl.c b/bacula/src/filed/acl.c
index 018323db26..46a98ce252 100644
--- a/bacula/src/filed/acl.c
+++ b/bacula/src/filed/acl.c
@@ -113,10 +113,10 @@ JCR jcr;
  *    with what we have and give all ACL streams a new number/type.
  */
 #endif
-#if !defined(HAVE_ACL)
-   || ( defined(HAVE_LINUX_OS)
-      || defined(HAVE_FREEBSD_OS)
-      || defined(HAVE_DARWIN_OS)
+#if !defined(HAVE_ACL) \
+   || !( defined(HAVE_LINUX_OS) \
+      || defined(HAVE_FREEBSD_OS) \
+      || defined(HAVE_DARWIN_OS) \
        )
 
 /* bacl_get() returns the lenght of the string, or -1 on error. */
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 506509e73a..062cd9d19d 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.34"
-#define BDATE   "05 August 2005"
-#define LSMDATE "05Aug05"
+#define BDATE   "06 August 2005"
+#define LSMDATE "06Aug05"
 
 /* Debug flags */
 #undef  DEBUG