uint8_t hash_tmp[XATTR_SD_HASH_SIZE];
uint8_t sys_acl_hash_tmp[XATTR_SD_HASH_SIZE];
struct security_descriptor *psd_blob = NULL;
- struct security_descriptor *pdesc_next = NULL;
+ struct security_descriptor *psd_fs = NULL;
const struct smb_filename *smb_fname = NULL;
bool ignore_file_system_acl = lp_parm_bool(SNUM(handle->conn),
ACL_MODULE_NAME,
fsp,
HASH_SECURITY_INFO,
mem_ctx,
- &pdesc_next);
+ &psd_fs);
} else {
status = SMB_VFS_NEXT_GET_NT_ACL(handle,
smb_fname,
HASH_SECURITY_INFO,
mem_ctx,
- &pdesc_next);
+ &psd_fs);
}
if (!NT_STATUS_IS_OK(status)) {
return status;
}
- /* Ensure we don't leak psd_next if we don't choose it.
+ /* Ensure we don't leak psd_fs if we don't choose it.
*
* We don't allocate it onto frame as it is preferred not to
* steal from a talloc pool.
*/
- talloc_steal(frame, pdesc_next);
+ talloc_steal(frame, psd_fs);
- status = hash_sd_sha256(pdesc_next, hash_tmp);
+ status = hash_sd_sha256(psd_fs, hash_tmp);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(psd_blob);
- psd_blob = pdesc_next;
+ psd_blob = psd_fs;
goto out;
}
if (DEBUGLEVEL >= 10) {
DEBUG(10,("get_nt_acl_internal: acl for blob hash for %s is:\n",
smb_fname->base_name ));
- NDR_PRINT_DEBUG(security_descriptor, pdesc_next);
+ NDR_PRINT_DEBUG(security_descriptor, psd_fs);
}
TALLOC_FREE(psd_blob);
- psd_blob = pdesc_next;
+ psd_blob = psd_fs;
}
out:
fsp,
security_info,
mem_ctx,
- &pdesc_next);
+ &psd_fs);
} else {
status = SMB_VFS_NEXT_GET_NT_ACL(handle,
smb_fname,
security_info,
mem_ctx,
- &pdesc_next);
+ &psd_fs);
}
if (!NT_STATUS_IS_OK(status)) {
return status;
}
- /* Ensure we don't leak psd_next if we don't choose it.
+ /* Ensure we don't leak psd_fs if we don't choose it.
*
* We don't allocate it onto frame as it is preferred not to
* steal from a talloc pool.
*/
- talloc_steal(frame, pdesc_next);
- psd_blob = pdesc_next;
+ talloc_steal(frame, psd_fs);
+ psd_blob = psd_fs;
}
- if (psd_blob != pdesc_next) {
+ if (psd_blob != psd_fs) {
/* We're returning the blob, throw
* away the filesystem SD. */
- TALLOC_FREE(pdesc_next);
+ TALLOC_FREE(psd_fs);
} else {
SMB_STRUCT_STAT sbuf;
SMB_STRUCT_STAT *psbuf = &sbuf;
is_directory = S_ISDIR(psbuf->st_ex_mode);
if (ignore_file_system_acl) {
- TALLOC_FREE(pdesc_next);
+ TALLOC_FREE(psd_fs);
status = make_default_filesystem_acl(mem_ctx,
smb_fname->base_name,
psbuf,