s3: smbd: Rename srv_set_signing() -> smb1_srv_set_signing()

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: David Mulder <dmulder@samba.org>
Autobuild-User(master): David Mulder <dmulder@samba.org>
Autobuild-Date(master): Tue Mar  8 23:05:19 UTC 2022 on sn-devel-184

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 17b9eb0c5d5ed2d1d4fad9f004b1a4e428df4501..5661fdfbf26bb34314369b942743bad15429f734 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -62,7 +62,7 @@ void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn,
                                bool allowed, bool mandatory);
 bool smb1_srv_is_signing_active(struct smbXsrv_connection *conn);
 bool smb1_srv_is_signing_negotiated(struct smbXsrv_connection *conn);
-void srv_set_signing(struct smbXsrv_connection *conn,
+void smb1_srv_set_signing(struct smbXsrv_connection *conn,
                     const DATA_BLOB user_session_key,
                     const DATA_BLOB response);
 

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 45bb6c80c0480aa5f3d4ef3ad09abeceb0266276..9b39cba894d23cfa421cbe899448aa30289b69cb 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -315,7 +315,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
                         * Try and turn on server signing on the first non-guest
                         * sessionsetup.
                         */
-                       srv_set_signing(xconn,
+                       smb1_srv_set_signing(xconn,
                                session->global->signing_key->blob,
                                data_blob_null);
                }
@@ -1055,7 +1055,7 @@ void reply_sesssetup_and_X(struct smb_request *req)
                 * Try and turn on server signing on the first non-guest
                 * sessionsetup.
                 */
-               srv_set_signing(xconn,
+               smb1_srv_set_signing(xconn,
                        session->global->signing_key->blob,
                        state->nt_resp.data ? state->nt_resp : state->lm_resp);
        }

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index 4c4b233b6aaaef57257e00c09109dc9443feec5a..bbb5379eb4a3d209a178a71676d297adfec0d78f 100644 (file)
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -290,7 +290,7 @@ bool smb1_srv_is_signing_negotiated(struct smbXsrv_connection *conn)
  Turn on signing from this packet onwards.
 ************************************************************/
 
-void srv_set_signing(struct smbXsrv_connection *conn,
+void smb1_srv_set_signing(struct smbXsrv_connection *conn,
                     const DATA_BLOB user_session_key,
                     const DATA_BLOB response)
 {
@@ -304,9 +304,9 @@ void srv_set_signing(struct smbXsrv_connection *conn,
        mandatory = smb1_signing_is_mandatory(conn->smb1.signing_state);
 
        if (!negotiated && !mandatory) {
-               DEBUG(5,("srv_set_signing: signing negotiated = %u, "
+               DBG_INFO("signing negotiated = %u, "
                         "mandatory_signing = %u. Not allowing smb signing.\n",
-                        negotiated, mandatory));
+                        negotiated, mandatory);
                return;
        }
 
@@ -315,8 +315,8 @@ void srv_set_signing(struct smbXsrv_connection *conn,
                return;
        }
 
-       DEBUG(3,("srv_set_signing: turning on SMB signing: "
+       DBG_NOTICE("turning on SMB signing: "
                 "signing negotiated = %u, mandatory_signing = %u.\n",
-                negotiated, mandatory));
+                negotiated, mandatory);
 }