summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-10-03 18:16:21 +0200
committerVolker Lendecke <vlendec@samba.org>2010-10-14 12:35:07 +0000
commitc2533f94b561e9b22d621b7515c6606d39ffec89 (patch)
tree03a1233df2387b0e20b43dfceb0111a6215db544 /source3/smbd
parent63e08ef8854bd9bde940fee774e94a6749825008 (diff)
downloadsamba-c2533f94b561e9b22d621b7515c6606d39ffec89.tar.gz
samba-c2533f94b561e9b22d621b7515c6606d39ffec89.tar.bz2
samba-c2533f94b561e9b22d621b7515c6606d39ffec89.zip
s3: Remove smbd_server_conn from construct_reply
Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Thu Oct 14 12:35:07 UTC 2010 on sn-devel-104
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/process.c10
1 files changed, 6 insertions, 4 deletions
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: