The branch, master has been updated
via 2bb90b7a88518844c1fcb8177cefcbc5b8ecda99 (commit)
via a790dcbc4ec2f3b29045ab9919cca5a9ca038e26 (commit)
from 2719216d60088eb3f10a2e3e968f15e8089b5491 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2bb90b7a88518844c1fcb8177cefcbc5b8ecda99
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Sun Nov 9 17:25:40 2008 +0100
Remove "conn" parameter from np_open, smb_request contains it
commit a790dcbc4ec2f3b29045ab9919cca5a9ca038e26
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Sun Nov 9 12:07:57 2008 +0100
Remove inbuf references from the trans2ioctl code
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 4 ++--
source3/rpc_server/srv_pipe_hnd.c | 5 +++--
source3/smbd/nttrans.c | 2 +-
source3/smbd/pipes.c | 2 +-
source3/smbd/trans2.c | 8 ++++----
5 files changed, 11 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 71f12a6..59df098 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6996,8 +6996,8 @@ pipes_struct *get_next_internal_pipe(pipes_struct *p);
void init_rpc_pipe_hnd(void);
bool fsp_is_np(struct files_struct *fsp);
-NTSTATUS np_open(struct smb_request *smb_req, struct connection_struct *conn,
- const char *name, struct files_struct **pfsp);
+NTSTATUS np_open(struct smb_request *smb_req, const char *name,
+ struct files_struct **pfsp);
NTSTATUS np_write(struct files_struct *fsp, const uint8_t *data, size_t len,
ssize_t *nwritten);
NTSTATUS np_read(struct files_struct *fsp, uint8_t *data, size_t len,
diff --git a/source3/rpc_server/srv_pipe_hnd.c
b/source3/rpc_server/srv_pipe_hnd.c
index 03a0f72..1cff95d 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -1078,9 +1078,10 @@ static struct np_proxy_state
*make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx,
return NULL;
}
-NTSTATUS np_open(struct smb_request *smb_req, struct connection_struct *conn,
- const char *name, struct files_struct **pfsp)
+NTSTATUS np_open(struct smb_request *smb_req, const char *name,
+ struct files_struct **pfsp)
{
+ struct connection_struct *conn = smb_req->conn;
NTSTATUS status;
struct files_struct *fsp;
const char **proxy_list;
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index fe2029e..18dd7d5 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -284,7 +284,7 @@ static void nt_open_pipe(char *fname, connection_struct
*conn,
/* Strip \\ off the name. */
fname++;
- status = np_open(req, conn, fname, &fsp);
+ status = np_open(req, fname, &fsp);
if (!NT_STATUS_IS_OK(status)) {
if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
reply_botherror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND,
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index b52b1b0..261f12c 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -78,7 +78,7 @@ void reply_open_pipe_and_X(connection_struct *conn, struct
smb_request *req)
}
#endif
- status = np_open(req, conn, fname, &fsp);
+ status = np_open(req, fname, &fsp);
if (!NT_STATUS_IS_OK(status)) {
if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
reply_botherror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND,
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index cc8c611..4dc2001 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -7269,8 +7269,8 @@ static void call_trans2ioctl(connection_struct *conn,
return;
}
- if ((SVAL(req->inbuf,(smb_setup+4)) == LMCAT_SPL)
- && (SVAL(req->inbuf,(smb_setup+6)) == LMFUNC_GETJOBID)) {
+ if ((SVAL(req->vwv+16, 0) == LMCAT_SPL)
+ && (SVAL(req->vwv+17, 0) == LMFUNC_GETJOBID)) {
*ppdata = (char *)SMB_REALLOC(*ppdata, 32);
if (*ppdata == NULL) {
reply_nterror(req, NT_STATUS_NO_MEMORY);
@@ -7613,8 +7613,8 @@ void reply_trans2(struct smb_request *req)
*/
if ( (state->setup_count == 4)
&& (tran_call == TRANSACT2_IOCTL)
- && (SVAL(req->inbuf,(smb_setup+4)) == LMCAT_SPL)
- && (SVAL(req->inbuf,(smb_setup+6)) == LMFUNC_GETJOBID)) {
+ && (SVAL(req->vwv+16, 0) == LMCAT_SPL)
+ && (SVAL(req->vwv+17, 0) == LMFUNC_GETJOBID)) {
DEBUG(2,("Got Trans2 DevIOctl jobid\n"));
} else {
DEBUG(2,("Invalid smb_sucnt in trans2
call(%u)\n",state->setup_count));
--
Samba Shared Repository
