summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix/pvfs_wait.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-07 10:05:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:37 -0500
commit2db915e06564b42bf7ebfa526b1af2e42e591590 (patch)
treea6cb2c29dcdc0278f8afd5b2ed9bdff9dce73d00 /source4/ntvfs/posix/pvfs_wait.c
parent5f608f23d32003456ebeed0ef6afdfd3f40aea25 (diff)
downloadsamba-2db915e06564b42bf7ebfa526b1af2e42e591590.tar.gz
samba-2db915e06564b42bf7ebfa526b1af2e42e591590.tar.bz2
samba-2db915e06564b42bf7ebfa526b1af2e42e591590.zip
r3595: - fixed a talloc_free ordering problem on cleanup with pending requests
- added initial support for MODE_INFORMATION in setfileinfo (I have no idea what "mode information" on a file is - it takes a value of 0, 2, 4 or 6. What could it be?) (This used to be commit e53ec2f6b68e1d19149c36ea8fcd25a204db38fb)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_wait.c')
-rw-r--r--source4/ntvfs/posix/pvfs_wait.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source4/ntvfs/posix/pvfs_wait.c b/source4/ntvfs/posix/pvfs_wait.c
index a226918877..968f659421 100644
--- a/source4/ntvfs/posix/pvfs_wait.c
+++ b/source4/ntvfs/posix/pvfs_wait.c
@@ -137,7 +137,7 @@ static int pvfs_wait_destructor(void *ptr)
pwait->msg_ctx = pvfs->tcon->smb_conn->connection->messaging_ctx;
pwait->ev = req->tcon->smb_conn->connection->event.ctx;
pwait->msg_type = msg_type;
- pwait->req = req;
+ pwait->req = talloc_reference(pwait, req);
pwait->pvfs = pvfs;
/* setup a timer */
@@ -162,10 +162,6 @@ static int pvfs_wait_destructor(void *ptr)
/* make sure we cleanup the timer and message handler */
talloc_set_destructor(pwait, pvfs_wait_destructor);
- /* make sure that on a disconnect the request is not destroyed
- before pvfs */
- talloc_steal(pvfs, req);
-
return pwait;
}