diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-12 20:41:35 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 11:44:43 +1000 |
| commit | dcfb6aad16b4b7b70a63340a17771d3f40aed1ce (patch) | |
| tree | 642350bd8b0e54bdbb24bcd7b712c411eedd3441 /source3/modules/vfs_gpfs.c | |
| parent | 47082ad3fae086c168bfedaa2fba692eccff3145 (diff) | |
| download | samba-dcfb6aad16b4b7b70a63340a17771d3f40aed1ce.tar.gz samba-dcfb6aad16b4b7b70a63340a17771d3f40aed1ce.tar.bz2 samba-dcfb6aad16b4b7b70a63340a17771d3f40aed1ce.zip | |
s3-smbd: Change allocation of smb_acl_t to talloc()
The acl element is changed to be a talloc child, and is no longer one element
longer than requested by virtue of the acl[1] base pointer.
This also avoids one of the few remaining cases of over-allocation of a structure.
Andrew Bartlett
Diffstat (limited to 'source3/modules/vfs_gpfs.c')
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 4e4df22ebe..874d00d048 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -594,7 +594,7 @@ static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl) DEBUG(10, ("Got invalid ace_type: %d\n", g_ace->ace_type)); errno = EINVAL; - SAFE_FREE(result); + TALLOC_FREE(result); return NULL; } @@ -648,7 +648,7 @@ static SMB_ACL_T gpfsacl_get_posix_acl(const char *path, gpfs_aclType_t type) done: if (errno != 0) { - SAFE_FREE(result); + TALLOC_FREE(result); } return result; } |