summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-06-01 12:17:43 -0700
committerJeremy Allison <jra@samba.org>2011-06-01 22:30:03 +0200
commitfebde0de5418ec40bb08159505e88997d9eb543c (patch)
tree8f018da2ba63e00648c49c44d3ebca201c8145b6
parent61e8c5949a50665158bdfd1e7624a5ad27d34a13 (diff)
downloadsamba-febde0de5418ec40bb08159505e88997d9eb543c.tar.gz
samba-febde0de5418ec40bb08159505e88997d9eb543c.tar.bz2
samba-febde0de5418ec40bb08159505e88997d9eb543c.zip
Move fd_close on error path to be identical to all other error paths.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed Jun 1 22:30:03 CEST 2011 on sn-devel-104
-rw-r--r--source3/smbd/open.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 373c0b3c42..d4b0934681 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2257,8 +2257,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
if (!NT_STATUS_IS_OK(status)) {
struct deferred_open_record state;
- fd_close(fsp);
-
state.delayed_for_oplocks = False;
state.id = id;
@@ -2274,6 +2272,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
req, &state);
}
TALLOC_FREE(lck);
+ fd_close(fsp);
return status;
}