From 9aa1d259070e93b3890933c932cbf6a2c84bc6fa Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 7 Aug 2009 15:21:07 +0200 Subject: s3:smbd: rename conn => sconn for smbd_server_connection structs This should avoid confusion between smbd_server_connection and connection_struct variables. metze --- source3/smbd/globals.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/smbd/globals.h') diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 338398968a..58c92de576 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -243,7 +243,7 @@ void smbd_server_connection_terminate_ex(struct smbd_server_connection *sconn, bool smbd_is_smb2_header(const uint8_t *inbuf, size_t size); void reply_smb2002(struct smb_request *req, uint16_t choice); -void smbd_smb2_first_negprot(struct smbd_server_connection *conn, +void smbd_smb2_first_negprot(struct smbd_server_connection *sconn, const uint8_t *inbuf, size_t size); NTSTATUS smbd_smb2_request_error_ex(struct smbd_smb2_request *req, @@ -296,7 +296,7 @@ struct smbd_smb2_request { TALLOC_CTX *mem_pool; struct smbd_smb2_request **parent; - struct smbd_server_connection *conn; + struct smbd_server_connection *sconn; /* the session the request operates on, maybe NULL */ struct smbd_smb2_session *session; @@ -361,7 +361,7 @@ struct smbd_server_connection; struct smbd_smb2_session { struct smbd_smb2_session *prev, *next; - struct smbd_server_connection *conn; + struct smbd_server_connection *sconn; NTSTATUS status; uint64_t vuid; AUTH_NTLMSSP_STATE *auth_ntlmssp_state; -- cgit