From 50883cfeb4eed3d538f71443060745f8747044c9 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 28 Apr 2011 17:38:09 +0200 Subject: s3-tevent: only include ../lib/util/tevent wrappers where needed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guenther Autobuild-User: Günther Deschner Autobuild-Date: Fri Apr 29 14:00:30 CEST 2011 on sn-devel-104 --- source3/smbd/smb2_read.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/smbd/smb2_read.c') diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index bffda89010..b21ce544d0 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -24,6 +24,7 @@ #include "smbd/globals.h" #include "../libcli/smb/smb_common.h" #include "libcli/security/security.h" +#include "../lib/util/tevent_ntstatus.h" static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, -- cgit From 047d8c073b57bc12648a251deaceedb65f4f59cf Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 29 Apr 2011 23:32:28 +0200 Subject: s3-proto: move more rpc_server prototypes out of proto.h Guenther --- source3/smbd/smb2_read.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/smbd/smb2_read.c') diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index b21ce544d0..6850d3df66 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -25,6 +25,7 @@ #include "../libcli/smb/smb_common.h" #include "libcli/security/security.h" #include "../lib/util/tevent_ntstatus.h" +#include "rpc_server/srv_pipe_hnd.h" static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, -- cgit From e5dd03d1991f125fa3cfddac9a41d2f9e6391c42 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 25 May 2011 18:51:56 +1000 Subject: s3-globals Remove smbd_event_context() (use server_event_context()) This has been a wrapper around server_event_context() for some time now, and removing this from dummmysmbd.c assists with library dependencies. Andrew Bartlett --- source3/smbd/smb2_read.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/smbd/smb2_read.c') diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index 6850d3df66..f90f569e8a 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -444,7 +444,7 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx, return tevent_req_post(req, ev); } - subreq = np_read_send(state, smbd_event_context(), + subreq = np_read_send(state, server_event_context(), fsp->fake_file_handle, state->out_data.data, state->out_data.length); -- cgit From d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 7 Jun 2011 11:38:41 +1000 Subject: s3-talloc Change TALLOC_P() to talloc() Using the standard macro makes it easier to move code into common, as TALLOC_P isn't standard talloc. --- source3/smbd/smb2_read.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/smbd/smb2_read.c') diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index f90f569e8a..6e686ef273 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -308,7 +308,7 @@ static NTSTATUS schedule_smb2_sendfile_read(struct smbd_smb2_request *smb2req, /* Make a copy of state attached to the smb2req. Attach the destructor here as this will trigger the sendfile call when the request is destroyed. */ - state_copy = TALLOC_P(smb2req, struct smbd_smb2_read_state); + state_copy = talloc(smb2req, struct smbd_smb2_read_state); if (!state_copy) { return NT_STATUS_NO_MEMORY; } -- cgit