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 f5d17059caea66126de20db9dfbcfdb44de936d7..ecf137b2587d0ceb5165ad104a625918237a31c3 100644 (file)
--- 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 018323db26fc3383429352fe9484a0b9a10918ce..46a98ce252ed8629c01b602f7ff20d9b970109f5 100644 (file)
--- 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 506509e73a88c7664126dc84347604be1bd57938..062cd9d19d646af4b338dddf9aeac751d95e29bb 100644 (file)
--- 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