summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-07-17 21:52:13 +0200
committerJeremy Allison <jra@samba.org>2012-07-18 15:54:04 -0700
commitf79fb4429c7fb9c2ae81f06fc8f2162a1ccd226c (patch)
tree083a47f71840237fb6bcf6af8ef8190b4cecb79a /source3
parent730d3e8973e3ef99aad126776a1db51282b226cb (diff)
downloadsamba-f79fb4429c7fb9c2ae81f06fc8f2162a1ccd226c.tar.gz
samba-f79fb4429c7fb9c2ae81f06fc8f2162a1ccd226c.tar.bz2
samba-f79fb4429c7fb9c2ae81f06fc8f2162a1ccd226c.zip
s3: Slightly simplify reply_close()
Signed-off-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c38
1 files changed, 13 insertions, 25 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 03af4ac403..954938cbe3 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4812,10 +4812,6 @@ void reply_exit(struct smb_request *req)
return;
}
-/****************************************************************************
- Reply to a close - has to deal with closing a directory opened by NT SMB's.
-****************************************************************************/
-
void reply_close(struct smb_request *req)
{
connection_struct *conn = req->conn;
@@ -4841,21 +4837,13 @@ void reply_close(struct smb_request *req)
return;
}
- if(fsp->is_directory) {
- /*
- * Special case - close NT SMB directory handle.
- */
- DEBUG(3,("close directory %s\n", fsp_fnum_dbg(fsp)));
- status = close_file(req, fsp, NORMAL_CLOSE);
- } else {
- time_t t;
- /*
- * Close ordinary file.
- */
+ DEBUG(3, ("Close %s fd=%d %s (numopen=%d)\n",
+ fsp->is_directory ? "directory" : "file",
+ fsp->fh->fd, fsp_fnum_dbg(fsp),
+ conn->num_files_open));
- DEBUG(3,("close fd=%d %s (numopen=%d)\n",
- fsp->fh->fd, fsp_fnum_dbg(fsp),
- conn->num_files_open));
+ if (!fsp->is_directory) {
+ time_t t;
/*
* Take care of any time sent in the close.
@@ -4863,15 +4851,15 @@ void reply_close(struct smb_request *req)
t = srv_make_unix_date3(req->vwv+1);
set_close_write_time(fsp, convert_time_t_to_timespec(t));
+ }
- /*
- * close_file() returns the unix errno if an error
- * was detected on close - normally this is due to
- * a disk full error. If not then it was probably an I/O error.
- */
+ /*
+ * close_file() returns the unix errno if an error was detected on
+ * close - normally this is due to a disk full error. If not then it
+ * was probably an I/O error.
+ */
- status = close_file(req, fsp, NORMAL_CLOSE);
- }
+ status = close_file(req, fsp, NORMAL_CLOSE);
if (!NT_STATUS_IS_OK(status)) {
reply_nterror(req, status);