diff options
| author | Volker Lendecke <vl@samba.org> | 2019-08-12 12:12:48 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-08-19 23:14:38 +0000 |
| commit | d09bd5f8fd4b2de28efcefc5839bd69bb088b88f (patch) | |
| tree | 920a28a8d554e703c3365120df3327c5bb5afb9a | |
| parent | 13fb42ac40067d1b335511e48354169ee15f29b3 (diff) | |
| download | samba-d09bd5f8fd4b2de28efcefc5839bd69bb088b88f.tar.gz | |
smbd: Merge two DEBUGs into one
This looks easier to understand to me, less lines in logfiles
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
| -rw-r--r-- | source3/smbd/open.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 1bac935d3b7..8d0464870f6 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1463,19 +1463,19 @@ static bool share_conflict(struct share_mode_entry *entry, { DBG_DEBUG("entry->access_mask = 0x%"PRIx32", " "entry->share_access = 0x%"PRIx32", " - "entry->private_options = 0x%"PRIx32"\n", + "entry->private_options = 0x%"PRIx32", " + "access_mask = 0x%"PRIx32", " + "share_access = 0x%"PRIx32"\n", entry->access_mask, entry->share_access, - entry->private_options); + entry->private_options, + access_mask, + share_access); if (server_id_is_disconnected(&entry->pid)) { return false; } - 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| |