diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-08-11 10:53:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:29 -0500 |
| commit | 8e146e4b7b284a4e89eea11272407c57090af395 (patch) | |
| tree | 2285a4a3932fc2aed289df9b6fbfad026ab0acc8 /source3/smbd/reply.c | |
| parent | 8d6dcd94eba51a39f510fc2351fb9e2b7fcbc3ce (diff) | |
| download | samba-8e146e4b7b284a4e89eea11272407c57090af395.tar.gz samba-8e146e4b7b284a4e89eea11272407c57090af395.tar.bz2 samba-8e146e4b7b284a4e89eea11272407c57090af395.zip | |
r24324: No reply_prep_legacy() in reply_pipe_read_and_X
(This used to be commit 304843315c5457ff0288d66d31f1ddb1ef2796f4)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 5d47e532cf..cf30c183fa 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2882,17 +2882,9 @@ void reply_read_and_X(connection_struct *conn, struct smb_request *req) startpos = IVAL_TO_SMB_OFF_T(req->inbuf,smb_vwv3); smb_maxcnt = SVAL(req->inbuf,smb_vwv5); - if (!reply_prep_legacy(req, &inbuf, &outbuf, &length, &bufsize)) { - reply_nterror(req, NT_STATUS_NO_MEMORY); - END_PROFILE(SMBreadX); - return; - } - /* If it's an IPC, pass off the pipe handler. */ if (IS_IPC(conn)) { - reply_post_legacy( - req, - reply_pipe_read_and_X(inbuf,outbuf,length,bufsize)); + reply_pipe_read_and_X(req); END_PROFILE(SMBreadX); return; } @@ -2908,6 +2900,12 @@ void reply_read_and_X(connection_struct *conn, struct smb_request *req) return; } + if (!reply_prep_legacy(req, &inbuf, &outbuf, &length, &bufsize)) { + reply_nterror(req, NT_STATUS_NO_MEMORY); + END_PROFILE(SMBreadX); + return; + } + set_message(inbuf,outbuf,12,0,True); if (global_client_caps & CAP_LARGE_READX) { |