s3: libcli: Rename smb_signing_check_pdu() -> smb1_signing_check_pdu()

Fix the debugs that also used this name.

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: David Mulder <dmulder@samba.org>

3 files changed, 12 insertions, 14 deletions

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 8159135491a..c24613d9374 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -801,7 +801,7 @@ bool smb1cli_conn_check_signing(struct smbXcli_conn *conn,
 	const uint8_t *hdr = buf + NBT_HDR_SIZE;
 	size_t len = smb_len_nbt(buf);
 
-	return smb_signing_check_pdu(conn->smb1.signing, hdr, len, seqnum);
+	return smb1_signing_check_pdu(conn->smb1.signing, hdr, len, seqnum);
 }
 
 bool smb1cli_conn_signing_is_active(struct smbXcli_conn *conn)
@@ -2295,7 +2295,7 @@ static NTSTATUS smb1cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
 	state = tevent_req_data(req, struct smbXcli_req_state);
 
 	if (!oplock_break /* oplock breaks are not signed */
-	    && !smb_signing_check_pdu(conn->smb1.signing,
+	    && !smb1_signing_check_pdu(conn->smb1.signing,
 				      inhdr, len, state->smb1.seqnum+1)) {
 		DEBUG(10, ("cli_check_sign_mac failed\n"));
 		return NT_STATUS_ACCESS_DENIED;
diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c
index 52c10354ea0..acb2fd5cd06 100644
--- a/libcli/smb/smb_signing.c
+++ b/libcli/smb/smb_signing.c
@@ -307,7 +307,7 @@ NTSTATUS smb1_signing_sign_pdu(struct smb1_signing_state *si,
 	return NT_STATUS_OK;
 }
 
-bool smb_signing_check_pdu(struct smb1_signing_state *si,
+bool smb1_signing_check_pdu(struct smb1_signing_state *si,
 			   const uint8_t *inhdr, size_t len,
 			   uint32_t seqnum)
 {
@@ -321,9 +321,9 @@ bool smb_signing_check_pdu(struct smb1_signing_state *si,
 	}
 
 	if (len < (HDR_SS_FIELD + 8)) {
-		DEBUG(1,("smb_signing_check_pdu: Can't check signature "
+		DBG_WARNING("Can't check signature "
 			 "on short packet! smb_len = %u\n",
-			 (unsigned)len));
+			 (unsigned)len);
 		return false;
 	}
 
@@ -345,28 +345,26 @@ bool smb_signing_check_pdu(struct smb1_signing_state *si,
 		int i;
 		const int sign_range = 5;
 
-		DEBUG(5, ("smb_signing_check_pdu: BAD SIG: wanted SMB signature of\n"));
+		DBG_INFO("BAD SIG: wanted SMB signature of\n");
 		dump_data(5, calc_md5_mac, 8);
 
-		DEBUG(5, ("smb_signing_check_pdu: BAD SIG: got SMB signature of\n"));
+		DBG_INFO("BAD SIG: got SMB signature of\n");
 		dump_data(5, reply_sent_mac, 8);
 
 		for (i = -sign_range; i < sign_range; i++) {
 			smb1_signing_md5(&si->mac_key, inhdr, len,
 					seqnum+i, calc_md5_mac);
 			if (memcmp(reply_sent_mac, calc_md5_mac, 8) == 0) {
-				DEBUG(0,("smb_signing_check_pdu: "
-					 "out of seq. seq num %u matches. "
+				DBG_ERR("out of seq. seq num %u matches. "
 					 "We were expecting seq %u\n",
 					 (unsigned int)seqnum+i,
-					 (unsigned int)seqnum));
+					 (unsigned int)seqnum);
 				break;
 			}
 		}
 	} else {
-		DEBUG(10, ("smb_signing_check_pdu: seq %u: "
-			   "got good SMB signature of\n",
-			   (unsigned int)seqnum));
+		DBG_DEBUG("seq %u: got good SMB signature of\n",
+			   (unsigned int)seqnum);
 		dump_data(10, reply_sent_mac, 8);
 	}
 
diff --git a/libcli/smb/smb_signing.h b/libcli/smb/smb_signing.h
index c2e7d00a6c4..0b82c209d60 100644
--- a/libcli/smb/smb_signing.h
+++ b/libcli/smb/smb_signing.h
@@ -39,7 +39,7 @@ void smb1_signing_cancel_reply(struct smb1_signing_state *si, bool oneway);
 NTSTATUS smb1_signing_sign_pdu(struct smb1_signing_state *si,
 			      uint8_t *outhdr, size_t len,
 			      uint32_t seqnum);
-bool smb_signing_check_pdu(struct smb1_signing_state *si,
+bool smb1_signing_check_pdu(struct smb1_signing_state *si,
 			   const uint8_t *inhdr, size_t len,
 			   uint32_t seqnum);
 bool smb_signing_activate(struct smb1_signing_state *si,