summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-11-12 12:49:40 +0100
committerMichael Adam <obnox@samba.org>2007-11-13 15:50:14 +0100
commitb2f942cfe2672fac9449ce730b18cf7b5fc6e1f0 (patch)
tree0bc287abf61034c56ad2f45551db9ff116dd5ad3 /source3
parent7559fc08c26c01e06cc3ed2feb6fdab0486a48c9 (diff)
downloadsamba-b2f942cfe2672fac9449ce730b18cf7b5fc6e1f0.tar.gz
samba-b2f942cfe2672fac9449ce730b18cf7b5fc6e1f0.tar.bz2
samba-b2f942cfe2672fac9449ce730b18cf7b5fc6e1f0.zip
Fix build of the zfs_acl module.
There was one caller of smb_get_nt_acl_nfs4() forgotten in the change of return value. Michael (This used to be commit 4d3e84a3b3a39d3d2c9b86affa16c8124b1496e5)
Diffstat (limited to 'source3')
-rw-r--r--source3/modules/vfs_zfsacl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index d265931cf2..0fe21b2909 100644
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -65,7 +65,9 @@ static NTSTATUS zfs_get_nt_acl(struct files_struct *fsp, uint32 security_info,
return map_nt_error_from_unix(errno);
}
/* create SMB4ACL data */
- if((pacl = smb_create_smb4acl()) == NULL) return 0;
+ if((pacl = smb_create_smb4acl()) == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
for(i=0; i<naces; i++) {
SMB_ACE4PROP_T aceprop;