Changeset 745 for trunk/server/source3/modules/vfs_zfsacl.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/vfs_zfsacl.c (modified) (6 diffs)

trunk/server/source3/modules/vfs_zfsacl.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "smbd/smbd.h"
 #include "nfs4_acls.h"
+
+#if HAVE_FREEBSD_SUNACL_H
+#include "sunacl.h"
+#endif
 
 #undef DBGC_CLASS
@@ -107 +113 @@
         SMB4ACE_T *smbace;
         TALLOC_CTX      *mem_ctx;
+        bool have_special_id = false;
 
         /* allocate the field of ZFS aces */
@@ -124 +131 @@
                 acebuf[i].a_flags       = aceprop->aceFlags;
                 acebuf[i].a_access_mask = aceprop->aceMask;
+                /* SYNC on acls is a no-op on ZFS.
+                   See bug #7909. */
+                acebuf[i].a_access_mask &= ~SMB_ACE4_SYNCHRONIZE;
                 acebuf[i].a_who         = aceprop->who.id;
                 if(aceprop->flags & SMB_ACE4_ID_SPECIAL) {
@@ -141 +151 @@
                                 continue; /* don't add it !!! */
                         }
+                        have_special_id = true;
                 }
         }
+
+        if (!have_special_id
+            && lp_parm_bool(fsp->conn->params->service, "zfsacl",
+                            "denymissingspecial", false)) {
+                errno = EACCES;
+                return false;
+        }
+
         SMB_ASSERT(i == naces);
 
@@ -209 +228 @@
                          files_struct *fsp,
                          uint32 security_info_sent,
-                         const SEC_DESC *psd)
+                         const struct security_descriptor *psd)
 {
         return zfs_set_nt_acl(handle, fsp, security_info_sent, psd);
@@ -245 +264 @@
 */
 
-SMB_ACL_T zfsacl_fail__sys_acl_get_file(vfs_handle_struct *handle,
-                                        const char *path_p,
-                                        SMB_ACL_TYPE_T type)
+static SMB_ACL_T zfsacl_fail__sys_acl_get_file(vfs_handle_struct *handle,
+                                               const char *path_p,
+                                               SMB_ACL_TYPE_T type)
 {
         return (SMB_ACL_T)NULL;
 }
-SMB_ACL_T zfsacl_fail__sys_acl_get_fd(vfs_handle_struct *handle,
-                                      files_struct *fsp,
-                                      int fd)
+
+static SMB_ACL_T zfsacl_fail__sys_acl_get_fd(vfs_handle_struct *handle,
+                                             files_struct *fsp)
 {
         return (SMB_ACL_T)NULL;
 }
 
-int zfsacl_fail__sys_acl_set_file(vfs_handle_struct *handle,
-                                  const char *name,
-                                  SMB_ACL_TYPE_T type,
-                                  SMB_ACL_T theacl)
+static int zfsacl_fail__sys_acl_set_file(vfs_handle_struct *handle,
+                                         const char *name,
+                                         SMB_ACL_TYPE_T type,
+                                         SMB_ACL_T theacl)
 {
         return -1;
 }
 
-int zfsacl_fail__sys_acl_set_fd(vfs_handle_struct *handle,
-                                files_struct *fsp,
-                                int fd, SMB_ACL_T theacl)
+static int zfsacl_fail__sys_acl_set_fd(vfs_handle_struct *handle,
+                                       files_struct *fsp,
+                                       SMB_ACL_T theacl)
 {
         return -1;
 }
 
-int zfsacl_fail__sys_acl_delete_def_file(vfs_handle_struct *handle,
-                                         const char *path)
+static int zfsacl_fail__sys_acl_delete_def_file(vfs_handle_struct *handle,
+                                                const char *path)
 {
         return -1;