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 ea2fae5ebc094c27e9dfd35250272bc515777dd1..649a132bad05facf9e5b1d762fb66c777485f4dd 100644 (file)
--- 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 153f9a430b6ceb1235460f442c75ae5a725e2188..bd0e4644614665adbe2a45ad919d92376ef89a8b 100644 (file)
--- 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;
        }