r24423: Convert reply_lseek to the new API

diff --git a/source/smbd/process.c b/source/smbd/process.c
index 1241741449705ca13c0f9a8b99749744f32a8480..fe6da4b265ef74d273e405db694c9c5a115298de 100644 (file)
--- a/source/smbd/process.c
+++ b/source/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/source/smbd/reply.c b/source/smbd/reply.c
index 87e3e29a4ac00f0d378f04b88a24fee933cfd8c9..80a2e9ff14488e9d5d342c8dd91315c804d8dde1 100644 (file)
--- a/source/smbd/reply.c
+++ b/source/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, &current_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;
 }
 
 /****************************************************************************