From: Jeremy Allison Date: Tue, 8 Mar 2022 03:46:58 +0000 (-0800) Subject: s3: smbd: Rename srv_set_signing_negotiated() -> smb1_srv_set_signing_negotiated(). X-Git-Tag: tevent-0.12.0~510 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93eaaccf8e6e8652e10f5e3990db78dc113546ed;p=thirdparty%2Fsamba.git s3: smbd: Rename srv_set_signing_negotiated() -> smb1_srv_set_signing_negotiated(). Signed-off-by: Jeremy Allison Signed-off-by: David Mulder --- diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index bb8fdc16a71..9b367c8e943 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -58,7 +58,7 @@ NTSTATUS smb1_srv_calculate_sign_mac(struct smbXsrv_connection *conn, char *outbuf, uint32_t seqnum); void smb1_srv_cancel_sign_response(struct smbXsrv_connection *conn); bool srv_init_signing(struct smbXsrv_connection *conn); -void srv_set_signing_negotiated(struct smbXsrv_connection *conn, +void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn, bool allowed, bool mandatory); bool srv_is_signing_active(struct smbXsrv_connection *conn); bool srv_is_signing_negotiated(struct smbXsrv_connection *conn); diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 6803f542d95..c80cbfb2eb0 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -621,11 +621,11 @@ void reply_sesssetup_and_X(struct smb_request *req) } /* - * We can call srv_set_signing_negotiated() each time. + * We can call smb1_srv_set_signing_negotiated() each time. * It finds out when it needs to turn into a noop * itself. */ - srv_set_signing_negotiated(xconn, + smb1_srv_set_signing_negotiated(xconn, signing_allowed, signing_mandatory); diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c index f9cd3b7f303..cac31d2c50d 100644 --- a/source3/smbd/signing.c +++ b/source3/smbd/signing.c @@ -258,7 +258,7 @@ bool srv_init_signing(struct smbXsrv_connection *conn) } } -void srv_set_signing_negotiated(struct smbXsrv_connection *conn, +void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn, bool allowed, bool mandatory) { smb1_signing_set_negotiated(conn->smb1.signing_state,