summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2019-08-12 11:44:39 +0200
committerJeremy Allison <jra@samba.org>2019-08-19 23:14:38 +0000
commit13fb42ac40067d1b335511e48354169ee15f29b3 (patch)
tree707c6f2ebe3d8728597cd0b3c033160a720315e0
parenta0b0ea8f356ac3a788d7b33d249ed6ec3eecc4bb (diff)
downloadsamba-13fb42ac40067d1b335511e48354169ee15f29b3.tar.gz
smbd: Avoid casts in share_conflict()
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Ralph Böhme <slow@samba.org>
-rw-r--r--source3/smbd/open.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 13a7d7237c7..1bac935d3b7 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -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;
}