summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-11-09 17:25:40 +0100
committerVolker Lendecke <vl@samba.org>2008-11-28 10:06:32 +0100
commit2bb90b7a88518844c1fcb8177cefcbc5b8ecda99 (patch)
tree6f31ac877b86bd64dddbe5946cce7fbaff6dc4cd
parenta790dcbc4ec2f3b29045ab9919cca5a9ca038e26 (diff)
downloadsamba-2bb90b7a88518844c1fcb8177cefcbc5b8ecda99.tar.gz
samba-2bb90b7a88518844c1fcb8177cefcbc5b8ecda99.tar.bz2
samba-2bb90b7a88518844c1fcb8177cefcbc5b8ecda99.zip
Remove "conn" parameter from np_open, smb_request contains it
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/rpc_server/srv_pipe_hnd.c5
-rw-r--r--source3/smbd/nttrans.c2
-rw-r--r--source3/smbd/pipes.c2
4 files changed, 7 insertions, 6 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 71f12a6844..59df098d0d 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 03a0f72b33..1cff95dcab 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 fe2029eeed..18dd7d5c26 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 b52b1b02d0..261f12cb08 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,