summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-11-15 11:08:53 +0100
committerMichael Adam <obnox@samba.org>2007-11-15 11:08:53 +0100
commitc45970529c2dde29db94214bc4af1e4bbc050d40 (patch)
treedaffb8691ef88d0ae547458f8b77c1681911809b
parent51b46147f285a63bfa91ed3ec4dfb35c28bdea51 (diff)
downloadsamba-c45970529c2dde29db94214bc4af1e4bbc050d40.tar.gz
samba-c45970529c2dde29db94214bc4af1e4bbc050d40.tar.bz2
samba-c45970529c2dde29db94214bc4af1e4bbc050d40.zip
Fix bug #5083 (and duplicate bug #5084).
Make solarisacl_sys_acl_get_fd() return a result when there is one (thereby fixing a memleak). Thanks to Markus Zell for reporting this. Michael (This used to be commit 242fc0099cc81877d8e9630b46dfb8d4a3265d94)
-rw-r--r--source3/modules/vfs_solarisacl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index b29c218ff4..673b6805af 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -128,7 +128,7 @@ SMB_ACL_T solarisacl_sys_acl_get_fd(vfs_handle_struct *handle,
DEBUG(10, ("solarisacl_sys_acl_get_fd %s.\n",
((result == NULL) ? "failed" : "succeeded")));
SAFE_FREE(solaris_acl);
- return NULL;
+ return result;
}
int solarisacl_sys_acl_set_file(vfs_handle_struct *handle,