From: Jeremy Allison <jra@samba.org>
Date: Tue, 8 Mar 2022 03:22:51 +0000 (-0800)
Subject: s3: libcli: Rename smb_signing_sign_pdu() -> smb1_signing_sign_pdu()
X-Git-Tag: tevent-0.12.0~523
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a68caff962e6e601b04744a0aea42dc76c21456;p=thirdparty%2Fsamba.git

s3: libcli: Rename smb_signing_sign_pdu() -> smb1_signing_sign_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>
---

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index bcf64aebad2..8159135491a 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -1675,7 +1675,7 @@ static NTSTATUS smb1cli_conn_signv(struct smbXcli_conn *conn,
 
 	*seqnum = smb1_signing_next_seqnum(conn->smb1.signing,
 					  one_way_seqnum);
-	status = smb_signing_sign_pdu(conn->smb1.signing,
+	status = smb1_signing_sign_pdu(conn->smb1.signing,
 				      buf,
 				      talloc_get_size(buf),
 				      *seqnum);
diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c
index 6137a7b2d83..52c10354ea0 100644
--- a/libcli/smb/smb_signing.c
+++ b/libcli/smb/smb_signing.c
@@ -235,7 +235,7 @@ void smb1_signing_cancel_reply(struct smb1_signing_state *si, bool oneway)
 	}
 }
 
-NTSTATUS smb_signing_sign_pdu(struct smb1_signing_state *si,
+NTSTATUS smb1_signing_sign_pdu(struct smb1_signing_state *si,
 			      uint8_t *outhdr, size_t len,
 			      uint32_t seqnum)
 {
@@ -251,9 +251,9 @@ NTSTATUS smb_signing_sign_pdu(struct smb1_signing_state *si,
 
 	/* JRA Paranioa test - we should be able to get rid of this... */
 	if (len < (HDR_SS_FIELD + 8)) {
-		DEBUG(1,("smb_signing_sign_pdu: Logic error. "
+		DBG_WARNING("Logic error. "
 			 "Can't check signature on short packet! smb_len = %u\n",
-			 (unsigned)len));
+			 (unsigned)len);
 		abort();
 	}
 
@@ -296,7 +296,7 @@ NTSTATUS smb_signing_sign_pdu(struct smb1_signing_state *si,
 		}
 	}
 
-	DEBUG(10, ("smb_signing_sign_pdu: sent SMB signature of\n"));
+	DBG_DEBUG("sent SMB signature of\n");
 	dump_data(10, calc_md5_mac, 8);
 
 	memcpy(&outhdr[HDR_SS_FIELD], calc_md5_mac, 8);
diff --git a/libcli/smb/smb_signing.h b/libcli/smb/smb_signing.h
index 10d09bbe2bf..c2e7d00a6c4 100644
--- a/libcli/smb/smb_signing.h
+++ b/libcli/smb/smb_signing.h
@@ -36,7 +36,7 @@ struct smb1_signing_state *smb1_signing_init_ex(TALLOC_CTX *mem_ctx,
 					      void (*free_fn)(TALLOC_CTX *, void *));
 uint32_t smb1_signing_next_seqnum(struct smb1_signing_state *si, bool oneway);
 void smb1_signing_cancel_reply(struct smb1_signing_state *si, bool oneway);
-NTSTATUS smb_signing_sign_pdu(struct smb1_signing_state *si,
+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,
diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index 78773505247..07c7e0d1d68 100644
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -89,7 +89,7 @@ NTSTATUS srv_calculate_sign_mac(struct smbXsrv_connection *conn,
 	len = smb_len(outbuf);
 	outhdr = (uint8_t *)outbuf + NBT_HDR_SIZE;
 
-	return smb_signing_sign_pdu(conn->smb1.signing_state,
+	return smb1_signing_sign_pdu(conn->smb1.signing_state,
 				    outhdr,
 				    len,
 				    seqnum);