From c2533f94b561e9b22d621b7515c6606d39ffec89 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 3 Oct 2010 18:16:21 +0200 Subject: s3: Remove smbd_server_conn from construct_reply Autobuild-User: Volker Lendecke Autobuild-Date: Thu Oct 14 12:35:07 UTC 2010 on sn-devel-104 --- source3/smbd/process.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 17491bea4c..ff2b8fc67d 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1570,7 +1570,8 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req, in Construct a reply to the incoming packet. ****************************************************************************/ -static void construct_reply(char *inbuf, int size, size_t unread_bytes, +static void construct_reply(struct smbd_server_connection *sconn, + char *inbuf, int size, size_t unread_bytes, uint32_t seqnum, bool encrypted, struct smb_perfcount_data *deferred_pcd) { @@ -1581,8 +1582,8 @@ static void construct_reply(char *inbuf, int size, size_t unread_bytes, smb_panic("could not allocate smb_request"); } - if (!init_smb_request(req, smbd_server_conn, (uint8 *)inbuf, - unread_bytes, encrypted, seqnum)) { + if (!init_smb_request(req, sconn, (uint8 *)inbuf, unread_bytes, + encrypted, seqnum)) { exit_server_cleanly("Invalid SMB request"); } @@ -1675,7 +1676,8 @@ static void process_smb(struct smbd_server_connection *sconn, show_msg((char *)inbuf); - construct_reply((char *)inbuf,nread,unread_bytes,seqnum,encrypted,deferred_pcd); + construct_reply(sconn, (char *)inbuf, nread, unread_bytes, seqnum, + encrypted, deferred_pcd); sconn->trans_num++; done: -- cgit