From 453a822a76780063dff23526c35408866d0c0154 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 13 Dec 1999 13:27:58 +0000
Subject: first pass at updating head branch to be to be the same as the
 SAMBA_2_0 branch

---
 source/smbd/files.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'source/smbd/files.c')

diff --git a/source/smbd/files.c b/source/smbd/files.c
index 7f4533e7ae7..d6203580cf5 100644
--- a/source/smbd/files.c
+++ b/source/smbd/files.c
@@ -186,10 +186,7 @@ void file_close_conn(connection_struct *conn)
 	for (fsp=Files;fsp;fsp=next) {
 		next = fsp->next;
 		if (fsp->conn == conn && fsp->open) {
-			if (fsp->is_directory)
-				close_directory(fsp); 
-			else                  
-				close_file(fsp,False); 
+			close_file(fsp,False); 
 		}
 	}
 }
@@ -226,7 +223,7 @@ open files, %d are available.\n", request_max_open_files, real_max_open_files));
 	}
 	
 	/*
-	 * Ensure that pipe_handle_offset is set correctly.
+	 * Ensure that pipe_handle_oppset is set correctly.
 	 */
 	set_pipe_handle_offset(real_max_open_files);
 }
@@ -242,10 +239,7 @@ void file_close_user(int vuid)
 	for (fsp=Files;fsp;fsp=next) {
 		next=fsp->next;
 		if ((fsp->vuid == vuid) && fsp->open) {
-			if(!fsp->is_directory)
-				close_file(fsp,False);
-			else
-				close_directory(fsp);
+			close_file(fsp,False);
 		}
 	}
 }
@@ -340,13 +334,13 @@ void file_sync_all(connection_struct *conn)
 
 	for (fsp=Files;fsp;fsp=next) {
 		next=fsp->next;
-		if (fsp->open && (conn == fsp->conn) && (fsp->fd_ptr != NULL)
-		    && lp_strict_sync(SNUM(conn))){
-		    conn->vfs_ops.sync(fsp->fd_ptr->fd);
+		if (fsp->open && (conn == fsp->conn) && (fsp->fd_ptr != NULL)) {
+			sync_file(conn,fsp);
 		}
 	}
 }
 
+
 /****************************************************************************
 free up a fd_ptr
 ****************************************************************************/
-- 
cgit