diff options
| author | Jeremy Allison <jra@samba.org> | 2003-02-04 01:43:11 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-02-04 01:43:11 +0000 |
| commit | 349c83f243e4e7309569a6d428825c8a25214a5e (patch) | |
| tree | 3ad95ad70c2f7cdae77190891d14421213ca2fd2 | |
| parent | d74edbb4837b62cd43332cbe24d46c0a1b7a2598 (diff) | |
| download | samba-349c83f243e4e7309569a6d428825c8a25214a5e.tar.gz samba-349c83f243e4e7309569a6d428825c8a25214a5e.tar.bz2 samba-349c83f243e4e7309569a6d428825c8a25214a5e.zip | |
Ensure we only ever set fsp->conn in one place.
Jeremy.
(This used to be commit 2110901b381f2a749605c8e8b262fa5ceba11169)
| -rw-r--r-- | source3/printing/printfsp.c | 1 | ||||
| -rw-r--r-- | source3/smbd/open.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/source3/printing/printfsp.c b/source3/printing/printfsp.c index f028e1f564..45d937f29c 100644 --- a/source3/printing/printfsp.c +++ b/source3/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/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++; |