summaryrefslogtreecommitdiffstats
path: root/source
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
commitd8a42753cc1e1a94aa6b816222343e1569521f14 (patch)
tree1bca288d72138c21b1e59ecf8cabab6bd133f470 /source
parentb3df40bc803e7dc3b66a95eccb335e2b1775560e (diff)
downloadsamba-d8a42753cc1e1a94aa6b816222343e1569521f14.tar.gz
samba-d8a42753cc1e1a94aa6b816222343e1569521f14.tar.xz
samba-d8a42753cc1e1a94aa6b816222343e1569521f14.zip
Ensure we only ever set fsp->conn in one place.
Jeremy.
Diffstat (limited to 'source')
-rw-r--r--source/printing/printfsp.c1
-rw-r--r--source/smbd/open.c7
2 files changed, 0 insertions, 8 deletions
diff --git a/source/printing/printfsp.c b/source/printing/printfsp.c
index f028e1f564a..45d937f29c4 100644
--- a/source/printing/printfsp.c
+++ b/source/printing/printfsp.c
@@ -77,7 +77,6 @@ files_struct *print_fsp_open(connection_struct *conn, char *fname)
fsp->sent_oplock_break = NO_BREAK_SENT;
fsp->is_directory = False;
fsp->directory_delete_on_close = False;
- fsp->conn = conn;
string_set(&fsp->fsp_name,print_job_fname(SNUM(conn),jobid));
fsp->wbmpx_ptr = NULL;
fsp->wcp = NULL;
diff --git a/source/smbd/open.c b/source/smbd/open.c
index dea7edc528e..65707458166 100644
--- a/source/smbd/open.c
+++ b/source/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++;