From: Jeremy Allison Date: Tue, 8 Mar 2022 03:57:15 +0000 (-0800) Subject: s3: smbd: Rename srv_set_signing() -> smb1_srv_set_signing() X-Git-Tag: tevent-0.12.0~507 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=239178aee363be2c3add4063fe9c50f482a58ed1;p=thirdparty%2Fsamba.git s3: smbd: Rename srv_set_signing() -> smb1_srv_set_signing() Signed-off-by: Jeremy Allison Signed-off-by: David Mulder Autobuild-User(master): David Mulder 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 17b9eb0c5d5..5661fdfbf26 100644 --- 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 45bb6c80c04..9b39cba894d 100644 --- 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 4c4b233b6aa..bbb5379eb4a 100644 --- 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); }