From: Volker Lendecke <vl@samba.org>
Date: Wed, 13 Aug 2025 13:06:54 +0000 (+0200)
Subject: smbd: Modernize DEBUGs
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c899a42f640ac7f26ca759b28ed17494efe73564;p=thirdparty%2Fsamba.git

smbd: Modernize DEBUGs

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/smb1_pipes.c b/source3/smbd/smb1_pipes.c
index ea2fae5ebc0..649a132bad0 100644
--- a/source3/smbd/smb1_pipes.c
+++ b/source3/smbd/smb1_pipes.c
@@ -162,9 +162,9 @@ void reply_pipe_write_and_X(struct smb_request *req)
 		 * them (we don't trust the client). JRA.
 		 */
 		if (state->numtowrite < 2) {
-			DEBUG(0,("reply_pipe_write_and_X: start of message "
-				 "set and not enough data sent.(%u)\n",
-				 (unsigned int)state->numtowrite ));
+			DBG_ERR("start of message "
+				"set and not enough data sent.(%zu)\n",
+				state->numtowrite);
 			reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
 			return;
 		}
diff --git a/source3/smbd/smb2_process.c b/source3/smbd/smb2_process.c
index 153f9a430b6..bd0e4644614 100644
--- a/source3/smbd/smb2_process.c
+++ b/source3/smbd/smb2_process.c
@@ -741,8 +741,7 @@ bool init_smb1_request(struct smb_request *req,
 
 	/* Ensure we have at least smb_size bytes. */
 	if (req_size < smb_size) {
-		DEBUG(0,("init_smb1_request: invalid request size %u\n",
-			(unsigned int)req_size ));
+		DBG_ERR("invalid request size %zu\n", req_size);
 		return false;
 	}
 
@@ -780,18 +779,18 @@ bool init_smb1_request(struct smb_request *req,
 
 	/* Ensure we have at least wct words and 2 bytes of bcc. */
 	if (smb_size + req->wct*2 > req_size) {
-		DEBUG(0,("init_smb1_request: invalid wct number %u (size %u)\n",
-			(unsigned int)req->wct,
-			(unsigned int)req_size));
+		DBG_ERR("invalid wct number %" PRIu8 " (size %zu)\n",
+			req->wct,
+			req_size);
 		return false;
 	}
 	/* Ensure bcc is correct. */
 	if (((const uint8_t *)smb_buf_const(inbuf)) + req->buflen > inbuf + req_size) {
-		DEBUG(0,("init_smb1_request: invalid bcc number %u "
-			"(wct = %u, size %u)\n",
-			(unsigned int)req->buflen,
-			(unsigned int)req->wct,
-			(unsigned int)req_size));
+		DBG_ERR("invalid bcc number %" PRIu16 " "
+			"(wct = %" PRIu8 ", size %zu)\n",
+			req->buflen,
+			req->wct,
+			req_size);
 		return false;
 	}