Some TANDEM ACL support.

diff --git a/lib/sysacls.c b/lib/sysacls.c
index ad8b6d80d600779b522c6f156683ad954755a0e3..194efe24d3328600e27a36e557275a293205fb13 100644 (file)
--- a/lib/sysacls.c
+++ b/lib/sysacls.c
@@ -797,9 +797,17 @@ int sys_acl_free_acl(SMB_ACL_T acl_d)
 /* so it is important to check this and avoid acl()    */
 /* calls if it isn't there.                            */
 
-static BOOL hpux_acl_call_presence(void)
+#ifdef __TANDEM
+inline do_acl(const char *path_p, int cmd, int nentries, struct acl *aclbufp)
 {
+       return acl((char*)path_p, cmd, nentries, aclbufp);
+}
+#define acl(p,c,n,a) do_acl(p,c,n,a)
+#endif
 
+static BOOL hpux_acl_call_presence(void)
+{
+#ifndef __TANDEM
        shl_t handle = NULL;
        void *value;
        int ret_val=0;
@@ -820,6 +828,7 @@ static BOOL hpux_acl_call_presence(void)
        DEBUG(10, ("hpux_acl_call_presence: acl() system call is present. We have JFS 3.3 or above \n"));
 
        already_checked = True;
+#endif
        return True;
 }
 

diff --git a/lib/sysacls.h b/lib/sysacls.h
index 040fcdab2f9ad0787cb221ee1e4c67ab39224867..9c08255ed455b8706de866ac937409dacc8aabda 100644 (file)
--- a/lib/sysacls.h
+++ b/lib/sysacls.h
@@ -139,7 +139,9 @@ typedef struct acl *SMB_ACL_ENTRY_T;
 
 /* Based on the Solaris & UnixWare code. */
 
+#ifndef __TANDEM
 #undef GROUP
+#endif
 #include <sys/aclv.h>
 
 /* SVR4.2 ES/MP ACLs */