From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sun, 26 Sep 2010 20:27:12 +0000 (+0200)
Subject: Reverted the change of TRU64 to OSF1 for the OS detection rules. Although Compaq... 
X-Git-Tag: Release-5.2.1~1037
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=72863eb7569fa014b05e8f98aac32d773825b51c;p=bacula%2Fbacula

Reverted the change of TRU64 to OSF1 for the OS detection rules. Although Compaq/HP renamed OSF1 to TRU64 lets leave it for now.
---

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 77c491959d..2ffb3abbc4 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2742,7 +2742,7 @@ if test x$support_xattr = xyes -o x$support_xattr = xauto; then
    dnl when running on a TRU64 OS.
    dnl
    if test $have_xattr = no -a \
-           x${HAVE_TRU64_OS}_TRUE = x; then
+           x${HAVE_OSF1_OS}_TRUE = x; then
       AC_CHECK_HEADER(sys/proplist.h, [ AC_DEFINE(HAVE_SYS_PROPLIST_H,1,[Defines if your system have the sys/proplist.h header file])] , )
       AC_CHECK_FUNCS(getproplist get_proplist_entry sizeof_proplist_entry add_proplist_entry setproplist,
 	 [
diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index 6ee46a32c9..825a102088 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -700,7 +700,7 @@ extern int thr_setconcurrency(int);
 
 #endif
 
-#if defined(HAVE_DARWIN_OS) || defined(HAVE_TRU64_OS)
+#if defined(HAVE_DARWIN_OS) || defined(HAVE_OSF1_OS)
 /* Apparently someone forgot to wrap getdomainname as a C function */
 extern "C" int getdomainname(char *name, int len);
 #endif
@@ -747,7 +747,7 @@ extern "C" int setdomainname(char *name, int namelen);
 #endif /* HAVE_HPUX_OS */
 
 
-#ifdef HAVE_TRU64_OS
+#ifdef HAVE_OSF1_OS
 extern "C" int fchdir(int filedes);
 extern "C" long gethostid(void);
 extern "C" int mknod(const char *path, int mode, dev_t device );
diff --git a/bacula/src/filed/acl.c b/bacula/src/filed/acl.c
index 17b79d3ece..d3aac220f0 100644
--- a/bacula/src/filed/acl.c
+++ b/bacula/src/filed/acl.c
@@ -407,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>
@@ -537,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;
@@ -882,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
diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c
index 2dcd07962a..de259061cf 100644
--- a/bacula/src/filed/xattr.c
+++ b/bacula/src/filed/xattr.c
@@ -1662,7 +1662,7 @@ bail_out:
 static bxattr_exit_code (*os_build_xattr_streams)(JCR *jcr, FF_PKT *ff_pkt) = bsd_build_xattr_streams;
 static bxattr_exit_code (*os_parse_xattr_streams)(JCR *jcr, int stream) = bsd_parse_xattr_streams;
 
-#elif defined(HAVE_TRU64_OS)
+#elif defined(HAVE_OSF1_OS)
 
 #if !defined(HAVE_GETPROPLIST) || \
     !defined(HAVE_GET_PROPLIST_ENTRY) || \
diff --git a/bacula/src/findlib/fstype.c b/bacula/src/findlib/fstype.c
index 21cd969546..4765f9415b 100644
--- a/bacula/src/findlib/fstype.c
+++ b/bacula/src/findlib/fstype.c
@@ -53,7 +53,7 @@
    "HAVE_NETBSD_OS\n" \
    "HAVE_OPENBSD_OS\n" \
    "HAVE_SUN_OS\n" \
-   "HAVE_TRU64_OS\n" \
+   "HAVE_OSF1_OS\n" \
    "HAVE_WIN32\n"
 #define false              0
 #define true               1
@@ -131,7 +131,7 @@ bool fstype(const char *fname, char *fs, int fslen)
 }
 
 #elif defined(HAVE_LINUX_OS) || \
-      defined(HAVE_TRU64_OS)
+      defined(HAVE_OSF1_OS)
 
 #include <sys/stat.h>
 #include "lib/mntent_cache.h"
diff --git a/bacula/src/lib/mntent_cache.c b/bacula/src/lib/mntent_cache.c
index 998dbdb6b9..14b304da52 100644
--- a/bacula/src/lib/mntent_cache.c
+++ b/bacula/src/lib/mntent_cache.c
@@ -41,10 +41,10 @@
  * - DARWIN (OSX)
  * - IRIX
  * - AIX
- * - TRU64 (True64)
+ * - OSF1 (Tru64)
  * - Solaris
  *
- * Currently we only use this code for Linux and TRU64 based fstype determination.
+ * Currently we only use this code for Linux and OSF1 based fstype determination.
  * For the other OS-es we can use the fstype present in stat structure on those OS-es.
  *
  * This code replaces the big switch we used before based on SUPER_MAGIC present in
@@ -88,7 +88,7 @@
 #elif defined(HAVE_AIX_OS)
 #include <fshelp.h>
 #include <sys/vfs.h>
-#elif defined(HAVE_TRU64_OS)
+#elif defined(HAVE_OSF1_OS)
 #include <sys/mount.h>
 #endif
 
@@ -275,7 +275,7 @@ static void refresh_mount_cache(void)
       cnt++;
    }
    free(entries);
-#elif defined(HAVE_TRU64_OS)
+#elif defined(HAVE_OSF1_OS)
    struct statfs *entries, *current;
    struct stat st;
    int n_entries, cnt;
diff --git a/bacula/src/win32/compat/winconfig.h b/bacula/src/win32/compat/winconfig.h
index 769dacacef..9433159add 100644
--- a/bacula/src/win32/compat/winconfig.h
+++ b/bacula/src/win32/compat/winconfig.h
@@ -188,7 +188,7 @@
 /* #undef HAVE_AIX_OS */
 /* #undef HAVE_SGI_OS */
 /* #define HAVE_CYGWIN 1 */
-/* #undef HAVE_TRU64_OS */
+/* #undef HAVE_OSF1_OS */
 /* #undef HAVE_DARWIN_OS */
 
 /* Set to correct scanf value for long long int */