summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-02-04 01:43:10 +0000
committerJeremy Allison <jra@samba.org>2003-02-04 01:43:10 +0000
commitce85e52eff9d8a61a58c559bdf4beb5e1284060d (patch)
tree3399286a69c66d5b708240b3da4f3afafe3f6f85 /source3/smbd
parent70a03079a78d8305221106a4c21102fd088a4362 (diff)
downloadsamba-ce85e52eff9d8a61a58c559bdf4beb5e1284060d.tar.gz
samba-ce85e52eff9d8a61a58c559bdf4beb5e1284060d.tar.bz2
samba-ce85e52eff9d8a61a58c559bdf4beb5e1284060d.zip
Ensure we only ever set fsp->conn in one place.
Jeremy. (This used to be commit d8a42753cc1e1a94aa6b816222343e1569521f14)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index dea7edc528..6570745816 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -230,7 +230,6 @@ static BOOL open_file(files_struct *fsp,connection_struct *conn,
fsp->is_directory = False;
fsp->is_stat = False;
fsp->directory_delete_on_close = False;
- fsp->conn = conn;
string_set(&fsp->fsp_name,fname);
fsp->wcp = NULL; /* Write cache pointer. */
@@ -1202,8 +1201,6 @@ files_struct *open_directory(connection_struct *conn, char *fname, SMB_STRUCT_ST
if(!fsp)
return NULL;
- fsp->conn = conn; /* The vfs_fXXX() macros need this. */
-
if (VALID_STAT(*psbuf))
got_stat = True;
@@ -1299,7 +1296,6 @@ files_struct *open_directory(connection_struct *conn, char *fname, SMB_STRUCT_ST
fsp->is_directory = True;
fsp->is_stat = False;
fsp->directory_delete_on_close = False;
- fsp->conn = conn;
string_set(&fsp->fsp_name,fname);
if (delete_on_close) {
@@ -1335,8 +1331,6 @@ files_struct *open_file_stat(connection_struct *conn, char *fname, SMB_STRUCT_ST
if(!fsp)
return NULL;
- fsp->conn = conn; /* The vfs_fXXX() macros need this. */
-
DEBUG(5,("open_file_stat: 'opening' file %s\n", fname));
/*
@@ -1365,7 +1359,6 @@ files_struct *open_file_stat(connection_struct *conn, char *fname, SMB_STRUCT_ST
fsp->is_directory = False;
fsp->is_stat = True;
fsp->directory_delete_on_close = False;
- fsp->conn = conn;
string_set(&fsp->fsp_name,fname);
conn->num_files_open++;