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>

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 8159135491aedf2c85b64001ec391086210748c9..c24613d9374ac81a05c0359566373e5921f3343d 100644 (file)
--- 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 52c10354ea0ed62a7784dded702bbfe205329e5a..acb2fd5cd061418b3b02cb8845c054ff9dc87150 100644 (file)
--- 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 c2e7d00a6c49a8663b3e2e6f4c44cd682c343243..0b82c209d60f370f41cb123562e749b378ad4720 100644 (file)
--- 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,

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index 07c7e0d1d688e0f17b1df2607b903bfdac32941e..d65da06c43b925c507ee684af251bc0faaa8b460 100644 (file)
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -48,16 +48,16 @@ bool srv_check_sign_mac(struct smbXsrv_connection *conn,
                NTSTATUS status;
 
                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;
                }
 
                status = NT_STATUS(IVAL(inhdr, HDR_SS_FIELD + 4));
                if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(1,("smb_signing_check_pdu: trusted channel passed %s\n",
-                                nt_errstr(status)));
+                       DBG_WARNING("trusted channel passed %s\n",
+                                nt_errstr(status));
                        return false;
                }
 
@@ -66,7 +66,7 @@ bool srv_check_sign_mac(struct smbXsrv_connection *conn,
        }
 
        *seqnum = smb1_signing_next_seqnum(conn->smb1.signing_state, false);
-       return smb_signing_check_pdu(conn->smb1.signing_state,
+       return smb1_signing_check_pdu(conn->smb1.signing_state,
                                     inhdr, len,
                                     *seqnum);
 }