From: Volker Lendecke <vl@samba.org>
Date: Mon, 12 Aug 2019 10:12:48 +0000 (+0200)
Subject: smbd: Merge two DEBUGs into one
X-Git-Tag: tdb-1.4.2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d09bd5f8fd4b2de28efcefc5839bd69bb088b88f;p=thirdparty%2Fsamba.git

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>
---

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|