From 62edc3d5dc68fbfe6cd77c588791453e29274dd9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 11 Apr 2005 20:52:02 +0000 Subject: [PATCH] =?utf8?q?r6297:=20Fix=20bug=20in=20our=20trans2=20seconda?= =?utf8?q?ry=20processing.=20We=20need=20to=20pass=20in=20the=20trans2=20c?= =?utf8?q?all=20info=20from=20the=20primary=20trans2=20packet=20as=20it=20?= =?utf8?q?isn't=20present=20in=20secondary=20transs=20packets.=20We=20only?= =?utf8?q?=20need=20to=20do=20this=20for=20functions=20that=20satisfy=20mo?= =?utf8?q?re=20than=20one=20case=20in=20the=20switch=20statement.=20Found?= =?utf8?q?=20by=20Marcel=20M=C3=BCller=20.=20Jeremy.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- source/smbd/trans2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index adc6322ac33..4fda95d6c0e 100644 --- a/source/smbd/trans2.c +++ b/source/smbd/trans2.c @@ -2660,12 +2660,12 @@ static BOOL marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_ ****************************************************************************/ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, + unsigned int tran_call, char **pparams, int total_params, char **ppdata, int total_data, unsigned int max_data_bytes) { char *params = *pparams; char *pdata = *ppdata; - uint16 tran_call = SVAL(inbuf, smb_setup0); uint16 info_level; int mode=0; SMB_OFF_T file_size=0; @@ -3557,12 +3557,12 @@ NTSTATUS hardlink_internals(connection_struct *conn, char *oldname, char *newnam ****************************************************************************/ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char *outbuf, int length, int bufsize, + unsigned int tran_call, char **pparams, int total_params, char **ppdata, int total_data, unsigned int max_data_bytes) { char *params = *pparams; char *pdata = *ppdata; - uint16 tran_call = SVAL(inbuf, smb_setup0); uint16 info_level; int dosmode=0; SMB_OFF_T size=0; @@ -5007,14 +5007,14 @@ int reply_trans2(connection_struct *conn, case TRANSACT2_QPATHINFO: case TRANSACT2_QFILEINFO: START_PROFILE_NESTED(Trans2_qpathinfo); - outsize = call_trans2qfilepathinfo(conn, inbuf, outbuf, length, bufsize, + outsize = call_trans2qfilepathinfo(conn, inbuf, outbuf, length, bufsize, tran_call, ¶ms, total_params, &data, total_data, max_data_bytes); END_PROFILE_NESTED(Trans2_qpathinfo); break; case TRANSACT2_SETPATHINFO: case TRANSACT2_SETFILEINFO: START_PROFILE_NESTED(Trans2_setpathinfo); - outsize = call_trans2setfilepathinfo(conn, inbuf, outbuf, length, bufsize, + outsize = call_trans2setfilepathinfo(conn, inbuf, outbuf, length, bufsize, tran_call, ¶ms, total_params, &data, total_data, max_data_bytes); END_PROFILE_NESTED(Trans2_setpathinfo); break; -- 2.47.3