passdb/secrets.c: Fix typo in comment.

rpc_server/srv_pipe.c: Use accessor functions rather than diddling with structure
internals directly.
smbd/process.c:
smbd/reply.c: Remove READ_PREDICTION #ifdefs.
Jeremy.
(This used to be commit eba825ff030a175bd271caa6f543379dfdbbd646)

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index acea54815cff018503460fbd9853983596679561..b0021599cc2618598a1008363e4f6e4abf621867 100644 (file)
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* the Samba secrets database stores any geerated, private information
+/* the Samba secrets database stores any generated, private information
    such as the local SID and machine trust password */
 
 #include "includes.h"

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 853c1b8ed6bf913fa985e2ff6be26e185d62103b..ebd4f55fcea183c2aeb477207c3db3e66814e0b1 100644 (file)
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -1107,7 +1107,7 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds
                return True;
        }
 
-       offset1 = p->out_data.rdata.data_offset;
+       offset1 = prs_offset(&p->out_data.rdata);
 
        /* do the actual command */
        if(!api_rpc_cmds[fn_num].fn(rpc_in, &p->out_data.rdata)) {
@@ -1117,10 +1117,10 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds
        }
 
        slprintf(name, sizeof(name), "out_%s", rpc_name);
-       offset2 = p->out_data.rdata.data_offset;
-       p->out_data.rdata.data_offset = offset1;
+       offset2 = prs_offset(&p->out_data.rdata);
+       prs_set_offset(&p->out_data.rdata, offset1);
        prs_dump(name, p->hdr_req.opnum, &p->out_data.rdata);
-       p->out_data.rdata.data_offset = offset2;
+       prs_set_offset(&p->out_data.rdata, offset2);
 
        DEBUG(5,("api_rpcTNP: called %s successfully\n", rpc_name));
 

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 3d2a507cca7d5edfc87698e1cf1963dc9b16d2c1..9e5b7b14778c04f704bcf995bc9c68c689a6b5aa 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1002,11 +1002,6 @@ void smbd_process(void)
     if (deadtime <= 0)
       deadtime = DEFAULT_SMBD_TIMEOUT;
 
-#if USE_READ_PREDICTION
-    if (lp_readprediction())
-      do_read_prediction();
-#endif
-
     errno = 0;      
 
     /* free up temporary memory */

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index b08606452f377528c0d1bfaec209ed0735e44e7f..eddd06e34334b2b668a09f4bb203f17511e1376e 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2067,11 +2067,6 @@ int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_s
     int predict=0;
     _smb_setlen(header,nread);
 
-#if USE_READ_PREDICTION
-    if (!fsp->can_write)
-      predict = read_predict(fsp, fsp->fd,startpos,header+4,NULL,nread);
-#endif /* USE_READ_PREDICTION */
-
     if ((nread-predict) > 0) {
       if(conn->vfs_ops.seek(fsp,startpos + predict) == -1) {
         DEBUG(0,("reply_readbraw: ERROR: seek_file failed.\n"));