mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
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 eba825ff03
)
This commit is contained in:
parent
32a7cf9188
commit
b27886addb
@ -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"
|
||||
|
@ -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));
|
||||
|
||||
|
@ -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 */
|
||||
|
@ -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"));
|
||||
|
Loading…
Reference in New Issue
Block a user