diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-08-14 16:04:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:44 -0500 |
| commit | fe502551c32263ef6faed26ee691aa1586f75104 (patch) | |
| tree | 8eaab58cbfd9a63921f12df0a4fa3eaaffef51dd | |
| parent | dee4ab15338841469729c794275eea158079e076 (diff) | |
| download | samba-fe502551c32263ef6faed26ee691aa1586f75104.tar.gz samba-fe502551c32263ef6faed26ee691aa1586f75104.tar.bz2 samba-fe502551c32263ef6faed26ee691aa1586f75104.zip | |
r24423: Convert reply_lseek to the new API
(This used to be commit bd228853863ce5b4b9b974347c50c956d7f2e055)
| -rw-r--r-- | source3/smbd/process.c | 2 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 37 |
2 files changed, 26 insertions, 13 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 1241741449..fe6da4b265 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -708,7 +708,7 @@ static const struct smb_message_struct { /* 0x0f */ { "SMBmknew",NULL,reply_mknew,AS_USER}, /* 0x10 */ { "SMBcheckpath",NULL,reply_checkpath,AS_USER}, /* 0x11 */ { "SMBexit",NULL,reply_exit,DO_CHDIR}, -/* 0x12 */ { "SMBlseek",reply_lseek,NULL,AS_USER}, +/* 0x12 */ { "SMBlseek",NULL,reply_lseek,AS_USER}, /* 0x13 */ { "SMBlockread",reply_lockread,NULL,AS_USER}, /* 0x14 */ { "SMBwriteunlock",reply_writeunlock,NULL,AS_USER}, /* 0x15 */ { NULL, NULL, NULL, 0 }, diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 87e3e29a4a..80a2e9ff14 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3636,22 +3636,32 @@ void reply_write_and_X(connection_struct *conn, struct smb_request *req) Reply to a lseek. ****************************************************************************/ -int reply_lseek(connection_struct *conn, char *inbuf,char *outbuf, int size, int dum_buffsize) +void reply_lseek(connection_struct *conn, struct smb_request *req) { SMB_OFF_T startpos; SMB_OFF_T res= -1; int mode,umode; - int outsize = 0; - files_struct *fsp = file_fsp(SVAL(inbuf,smb_vwv0)); + files_struct *fsp; + START_PROFILE(SMBlseek); - CHECK_FSP(fsp,conn); + if (req->wct < 4) { + reply_nterror(req, NT_STATUS_INVALID_PARAMETER); + END_PROFILE(SMBlseek); + return; + } + + fsp = file_fsp(SVAL(req->inbuf,smb_vwv0)); + + if (!check_fsp(conn, req, fsp, ¤t_user)) { + return; + } flush_write_cache(fsp, SEEK_FLUSH); - mode = SVAL(inbuf,smb_vwv1) & 3; + mode = SVAL(req->inbuf,smb_vwv1) & 3; /* NB. This doesn't use IVAL_TO_SMB_OFF_T as startpos can be signed in this case. */ - startpos = (SMB_OFF_T)IVALS(inbuf,smb_vwv2); + startpos = (SMB_OFF_T)IVALS(req->inbuf,smb_vwv2); switch (mode) { case 0: @@ -3678,8 +3688,10 @@ int reply_lseek(connection_struct *conn, char *inbuf,char *outbuf, int size, int SMB_STRUCT_STAT sbuf; if(SMB_VFS_FSTAT(fsp,fsp->fh->fd, &sbuf) == -1) { + reply_unixerror(req, ERRDOS, + ERRnoaccess); END_PROFILE(SMBlseek); - return(UNIXERROR(ERRDOS,ERRnoaccess)); + return; } current_pos += sbuf.st_size; @@ -3689,21 +3701,22 @@ int reply_lseek(connection_struct *conn, char *inbuf,char *outbuf, int size, int } if(res == -1) { + reply_unixerror(req, ERRDOS, ERRnoaccess); END_PROFILE(SMBlseek); - return(UNIXERROR(ERRDOS,ERRnoaccess)); + return; } } fsp->fh->pos = res; - - outsize = set_message(inbuf,outbuf,2,0,True); - SIVAL(outbuf,smb_vwv0,res); + + reply_outbuf(req, 2, 0); + SIVAL(req->outbuf,smb_vwv0,res); DEBUG(3,("lseek fnum=%d ofs=%.0f newpos = %.0f mode=%d\n", fsp->fnum, (double)startpos, (double)res, mode)); END_PROFILE(SMBlseek); - return(outsize); + return; } /**************************************************************************** |