diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-09-25 08:16:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:12 -0500 |
| commit | 045543b661c1ee2c1dac72203e634b9a08568081 (patch) | |
| tree | 125df7145d8d748dbdadc21091cb3eaee601a599 /source4/smb_server/reply.c | |
| parent | 20fb9ab6cdd3be9c9ffc897108dedb0f142122f1 (diff) | |
| download | samba-045543b661c1ee2c1dac72203e634b9a08568081.tar.gz samba-045543b661c1ee2c1dac72203e634b9a08568081.tar.bz2 samba-045543b661c1ee2c1dac72203e634b9a08568081.zip | |
r2618: before we had refererence counts in talloc I added a hack in the
server side request structure to prevent a structing being freed in
some circumstances. This change replaces this with the much more
robust mechanism of talloc_increase_ref_count().
(This used to be commit 3f7741f178b359f81cc98ef18cd69bf976123e9f)
Diffstat (limited to 'source4/smb_server/reply.c')
| -rw-r--r-- | source4/smb_server/reply.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c index 801327f086..72c7c20a11 100644 --- a/source4/smb_server/reply.c +++ b/source4/smb_server/reply.c @@ -1332,13 +1332,9 @@ void reply_echo(struct smbsrv_request *req) memcpy(req->out.data, req->in.data, req->in.data_size); - /* we need to make sure the request isn't destroyed till the - * last packet */ - req->control_flags |= REQ_CONTROL_PROTECTED; - for (i=1; i <= count;i++) { - if (i == count) { - req->control_flags &= ~REQ_CONTROL_PROTECTED; + if (i != count) { + talloc_increase_ref_count(req); } SSVAL(req->out.vwv, VWV(0), i); |