Import sfw build 143
Bugs Fixed
----------
6934319 Update gnuplot to version 4.4
6960032 update gocr to newer version
6961961 CVE-2010-2063 in Samba 3.3.x and below, a buffer overrun is possible in chain_reply code.
6962388 Wireshark update to version 1.2.9
/*
* Convert ZFS/NFSv4 acls to NT acls and vice versa.
*
* Copyright (C) Jiri Sasek, 2007
* based on the foobar.c module which is copyrighted by Volker Lendecke
*
* Many thanks to Axel Apitz for help to fix the special ace's handling
* issues.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
#include "includes.h"
#include "nfs4_acls.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
#define ZFSACL_MODULE_NAME "zfsacl"
/* zfs_get_nt_acl()
* read the local file's acls and return it in NT form
* using the NFSv4 format conversion
*/
static size_t zfs_get_nt_acl(struct files_struct *fsp, uint32 security_info,
SEC_DESC **ppdesc)
{
int naces, i;
ace_t *acebuf;
SMB4ACL_T *pacl;
TALLOC_CTX *mem_ctx;
/* read the number of file aces */
if((naces = acl(fsp->fsp_name, ACE_GETACLCNT, 0, NULL)) == -1) {
if(errno == ENOSYS) {
DEBUG(9, ("acl(ACE_GETACLCNT, %s): Operation is not supported on the filesystem where the file reside"));
} else {
DEBUG(9, ("acl(ACE_GETACLCNT, %s): %s ", fsp->fsp_name,
strerror(errno)));
}
return 0;
}
/* allocate the field of ZFS aces */
mem_ctx = main_loop_talloc_get();
acebuf = (ace_t *) talloc_size(mem_ctx, sizeof(ace_t)*naces);
if(acebuf == NULL) {
errno = ENOMEM;
return 0;
}
/* read the aces into the field */
if(acl(fsp->fsp_name, ACE_GETACL, naces, acebuf) < 0) {
DEBUG(9, ("acl(ACE_GETACL, %s): %s ", fsp->fsp_name,
strerror(errno)));
return 0;
}
/* create SMB4ACL data */
if((pacl = smb_create_smb4acl()) == NULL) return 0;
for(i=0; i<naces; i++) {
SMB_ACE4PROP_T aceprop;
aceprop.aceType = (uint32) acebuf[i].a_type;
aceprop.aceFlags = (uint32) acebuf[i].a_flags;
aceprop.aceMask = (uint32) acebuf[i].a_access_mask;
aceprop.who.id = (uint32) acebuf[i].a_who;
if(aceprop.aceFlags & ACE_OWNER) {
aceprop.flags = SMB_ACE4_ID_SPECIAL;
aceprop.who.special_id = SMB_ACE4_WHO_OWNER;
} else if(aceprop.aceFlags & ACE_GROUP) {
aceprop.flags = SMB_ACE4_ID_SPECIAL;
aceprop.who.special_id = SMB_ACE4_WHO_GROUP;
} else if(aceprop.aceFlags & ACE_EVERYONE) {
aceprop.flags = SMB_ACE4_ID_SPECIAL;
aceprop.who.special_id = SMB_ACE4_WHO_EVERYONE;
} else {
aceprop.flags = 0;
}
if(smb_add_ace4(pacl, &aceprop) == NULL) return 0;
}
return smb_get_nt_acl_nfs4(fsp, security_info, ppdesc, pacl);
}
/* call-back function processing the NT acl -> ZFS acl using NFSv4 conv. */
static BOOL zfs_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl)
{
int naces = smb_get_naces(smbacl), i;
ace_t *acebuf;
SMB4ACE_T *smbace;
TALLOC_CTX *mem_ctx;
/* allocate the field of ZFS aces */
mem_ctx = main_loop_talloc_get();
acebuf = (ace_t *) talloc_size(mem_ctx, sizeof(ace_t)*naces);
if(acebuf == NULL) {
errno = ENOMEM;
return False;
}
/* handle all aces */
for(smbace = smb_first_ace4(smbacl), i = 0;
smbace!=NULL;
smbace = smb_next_ace4(smbace), i++) {
SMB_ACE4PROP_T *aceprop = smb_get_ace4(smbace);
acebuf[i].a_type = aceprop->aceType;
acebuf[i].a_flags = aceprop->aceFlags;
acebuf[i].a_access_mask = aceprop->aceMask;
acebuf[i].a_who = aceprop->who.id;
if(aceprop->flags & SMB_ACE4_ID_SPECIAL) {
switch(aceprop->who.special_id) {
case SMB_ACE4_WHO_EVERYONE:
acebuf[i].a_flags |= ACE_EVERYONE;
break;
case SMB_ACE4_WHO_OWNER:
acebuf[i].a_flags |= ACE_OWNER;
break;
case SMB_ACE4_WHO_GROUP:
acebuf[i].a_flags |= ACE_GROUP;
break;
default:
DEBUG(8, ("unsupported special_id %d\n", \
aceprop->who.special_id));
continue; /* don't add it !!! */
}
}
}
SMB_ASSERT(i == naces);
/* store acl */
if(acl(fsp->fsp_name, ACE_SETACL, naces, acebuf)) {
if(errno == ENOSYS) {
DEBUG(9, ("acl(ACE_SETACL, %s): Operation is not supported on the filesystem where the file reside"));
} else {
DEBUG(9, ("acl(ACE_SETACL, %s): %s ", fsp->fsp_name,
strerror(errno)));
}
return 0;
}
return True;
}
/* zfs_set_nt_acl()
* set the local file's acls obtaining it in NT form
* using the NFSv4 format conversion
*/
static NTSTATUS zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
uint32 security_info_sent,
SEC_DESC *psd)
{
return smb_set_nt_acl_nfs4(fsp, security_info_sent, psd,
zfs_process_smbacl);
}
static size_t zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp,
int fd, uint32 security_info,
SEC_DESC **ppdesc)
{
return zfs_get_nt_acl(fsp, security_info, ppdesc);
}
static size_t zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp,
const char *name, uint32 security_info,
SEC_DESC **ppdesc)
{
return zfs_get_nt_acl(fsp, security_info, ppdesc);
}
static NTSTATUS zfsacl_fset_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
int fd, uint32 security_info_sent,
SEC_DESC *psd)
{
return zfs_set_nt_acl(handle, fsp, security_info_sent, psd);
}
static NTSTATUS zfsacl_set_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
const char *name, uint32 security_info_sent,
SEC_DESC *psd)
{
return zfs_set_nt_acl(handle, fsp, security_info_sent, psd);
}
/* [email protected] 2008-06-16 :
See also
- https://bugzilla.samba.org/show_bug.cgi?id=5446
- http://bugs.opensolaris.org/view_bug.do?bug_id=6688240
Solaris supports NFSv4 and ZFS ACLs through a common system call, acl(2)
with ACE_SETACL / ACE_GETACL / ACE_GETACLCNT, which is being wrapped for
use by samba in this module.
As the acl(2) interface is identical for ZFS and for NFS, this module,
vfs_zfsacl, can not only be used for ZFS, but also for sharing NFSv4
mounts on Solaris.
But while "traditional" POSIX DRAFT ACLs (using acl(2) with SETACL
/ GETACL / GETACLCNT) fail for ZFS, the Solaris NFS client
implemets a compatibility wrapper, which will make calls to
traditional ACL calls though vfs_solarisacl succeed. As the
compatibility wrapper's implementation is (by design) incomplete,
we want to make sure that it is never being called.
As long as Samba does not support an exiplicit method for a module
to define conflicting vfs methods, we should override all conflicting
methods here.
For this to work, we need to make sure that this module is initialised
*after* vfs_solarisacl
Function declarations taken from vfs_solarisacl
*/
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)
{
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)
{
return(-1);
}
int zfsacl_fail__sys_acl_set_fd(vfs_handle_struct *handle,
files_struct *fsp,
int fd, SMB_ACL_T theacl)
{
return(-1);
}
int zfsacl_fail__sys_acl_delete_def_file(vfs_handle_struct *handle,
const char *path)
{
return(-1);
}
/* VFS operations structure */
static vfs_op_tuple zfsacl_ops[] = {
/* invalidate conflicting VFS methods */
{SMB_VFS_OP(zfsacl_fail__sys_acl_get_file),
SMB_VFS_OP_SYS_ACL_GET_FILE,
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_fail__sys_acl_get_fd),
SMB_VFS_OP_SYS_ACL_GET_FD,
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_fail__sys_acl_set_file),
SMB_VFS_OP_SYS_ACL_SET_FILE,
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_fail__sys_acl_set_fd),
SMB_VFS_OP_SYS_ACL_SET_FD,
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_fail__sys_acl_delete_def_file),
SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,
SMB_VFS_LAYER_OPAQUE},
/* actual methods */
{SMB_VFS_OP(zfsacl_fget_nt_acl), SMB_VFS_OP_FGET_NT_ACL,
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_get_nt_acl), SMB_VFS_OP_GET_NT_ACL,
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_fset_nt_acl), SMB_VFS_OP_FSET_NT_ACL,
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_set_nt_acl), SMB_VFS_OP_SET_NT_ACL,
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
};
/* != 0 if this module will be compiled as static */
#define STATIC 0
#if STATIC
NTSTATUS vfs_zfsacl_init(void);
#else
NTSTATUS init_module(void);
#endif
NTSTATUS
#if STATIC
vfs_zfsacl_init
#else
init_module
#endif
(void)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
ZFSACL_MODULE_NAME ,
zfsacl_ops);
}