diff options
author | Stefan Metzmacher <metze@samba.org> | 2014-05-21 14:44:01 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2014-08-06 09:51:11 +0200 |
commit | 314ef691bab711bf48857a8d1ed84ab3323120bd (patch) | |
tree | 406e2931fbc1236a348bedc9f393375dba3093ef /source3/smbd/signing.c | |
parent | 7cf7fd77f746ca3c8225c8cadfff61f9314f919c (diff) | |
download | samba-314ef691bab711bf48857a8d1ed84ab3323120bd.tar.gz |
s3:smbd: move sconn->smb1.signing_state to xconn->smb1.signing_state
This prepares the structures for multi-channel support.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/smbd/signing.c')
-rw-r--r-- | source3/smbd/signing.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c index b7683cdc9d0..9fac87b5081 100644 --- a/source3/smbd/signing.c +++ b/source3/smbd/signing.c @@ -29,7 +29,7 @@ Called to validate an incoming packet from the client. ************************************************************/ -bool srv_check_sign_mac(struct smbd_server_connection *conn, +bool srv_check_sign_mac(struct smbXsrv_connection *conn, const char *inbuf, uint32_t *seqnum, bool trusted_channel) { @@ -75,7 +75,7 @@ bool srv_check_sign_mac(struct smbd_server_connection *conn, Called to sign an outgoing packet to the client. ************************************************************/ -void srv_calculate_sign_mac(struct smbd_server_connection *conn, +void srv_calculate_sign_mac(struct smbXsrv_connection *conn, char *outbuf, uint32_t seqnum) { uint8_t *outhdr; @@ -96,7 +96,7 @@ void srv_calculate_sign_mac(struct smbd_server_connection *conn, /*********************************************************** Called to indicate a oneway request ************************************************************/ -void srv_cancel_sign_response(struct smbd_server_connection *conn) +void srv_cancel_sign_response(struct smbXsrv_connection *conn) { smb_signing_cancel_reply(conn->smb1.signing_state, true); } @@ -167,7 +167,7 @@ static void smbd_shm_signing_free(TALLOC_CTX *mem_ctx, void *ptr) Called by server negprot when signing has been negotiated. ************************************************************/ -bool srv_init_signing(struct smbd_server_connection *conn) +bool srv_init_signing(struct smbXsrv_connection *conn) { bool allowed = true; bool desired; @@ -229,7 +229,7 @@ bool srv_init_signing(struct smbd_server_connection *conn) return true; } -void srv_set_signing_negotiated(struct smbd_server_connection *conn, +void srv_set_signing_negotiated(struct smbXsrv_connection *conn, bool allowed, bool mandatory) { smb_signing_set_negotiated(conn->smb1.signing_state, @@ -241,7 +241,7 @@ void srv_set_signing_negotiated(struct smbd_server_connection *conn, reads/writes if it is. ************************************************************/ -bool srv_is_signing_active(struct smbd_server_connection *conn) +bool srv_is_signing_active(struct smbXsrv_connection *conn) { return smb_signing_is_active(conn->smb1.signing_state); } @@ -252,7 +252,7 @@ bool srv_is_signing_active(struct smbd_server_connection *conn) in the negprot. ************************************************************/ -bool srv_is_signing_negotiated(struct smbd_server_connection *conn) +bool srv_is_signing_negotiated(struct smbXsrv_connection *conn) { return smb_signing_is_negotiated(conn->smb1.signing_state); } @@ -261,7 +261,7 @@ bool srv_is_signing_negotiated(struct smbd_server_connection *conn) Turn on signing from this packet onwards. ************************************************************/ -void srv_set_signing(struct smbd_server_connection *conn, +void srv_set_signing(struct smbXsrv_connection *conn, const DATA_BLOB user_session_key, const DATA_BLOB response) { |