mirror of
https://github.com/samba-team/samba.git
synced 2025-02-28 01:58:17 +03:00
Remove "conn" parameter from np_open, smb_request contains it
This commit is contained in:
parent
a790dcbc4e
commit
2bb90b7a88
@ -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,
|
||||
|
@ -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;
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user