sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

smbd: Avoid casts in share_conflict()

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2019-08-12 11:44:39 +02:00 committed by Jeremy Allison
parent a0b0ea8f35
commit 13fb42ac40
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source3/smbd/open.c
View File

@ -1461,28 +1461,29 @@ static bool share_conflict(struct share_mode_entry *entry,
uint32_t access_mask,
uint32_t share_access)
{
DEBUG(10,("share_conflict: entry->access_mask = 0x%x, "
"entry->share_access = 0x%x, "
"entry->private_options = 0x%x\n",
(unsigned int)entry->access_mask,
(unsigned int)entry->share_access,
(unsigned int)entry->private_options));
DBG_DEBUG("entry->access_mask = 0x%"PRIx32", "
"entry->share_access = 0x%"PRIx32", "
"entry->private_options = 0x%"PRIx32"\n",
entry->access_mask,
entry->share_access,
entry->private_options);
if (server_id_is_disconnected(&entry->pid)) {
return false;
}
DEBUG(10,("share_conflict: access_mask = 0x%x, share_access = 0x%x\n",
(unsigned int)access_mask, (unsigned int)share_access));
DBG_DEBUG("access_mask = 0x%"PRIx32", share_access = 0x%"PRIx32"\n",
access_mask,
share_access);
if ((entry->access_mask & (FILE_WRITE_DATA|
FILE_APPEND_DATA|
FILE_READ_DATA|
FILE_EXECUTE|
DELETE_ACCESS)) == 0) {
DEBUG(10,("share_conflict: No conflict due to "
"entry->access_mask = 0x%x\n",
(unsigned int)entry->access_mask ));
DBG_DEBUG("No conflict due to "
"entry->access_mask = 0x%"PRIx32"\n",
entry->access_mask);
return False;
}
@ -1491,9 +1492,8 @@ static bool share_conflict(struct share_mode_entry *entry,
FILE_READ_DATA|
FILE_EXECUTE|
DELETE_ACCESS)) == 0) {
DEBUG(10,("share_conflict: No conflict due to "
"access_mask = 0x%x\n",
(unsigned int)access_mask ));
DBG_DEBUG("No conflict due to access_mask = 0x%"PRIx32"\n",
access_mask);
return False;
}