diff options
author | Stefan Metzmacher <metze@samba.org> | 2012-06-08 17:51:47 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2012-06-29 21:01:11 +0200 |
commit | 7d1395536bbcc937e3115aa067eed3f69f3909be (patch) | |
tree | b8c1b3a6ba1d84cb94d8fdf0b8a6f0a74d8c74f6 /source3/smbd/globals.h | |
parent | f7762e2730aa4e2fe37043b56e0413983b484108 (diff) | |
download | samba-7d1395536bbcc937e3115aa067eed3f69f3909be.tar.gz |
s3:smbd: make use of smbXsrv_open for smb1/2/3
This makes sure we generate unique persistent file ids,
which are stored in smbXsrv_open_global.tdb.
Pair-Programmed-With: Michael Adam <obnox@samba.org>
metze
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Jun 29 21:01:11 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/smbd/globals.h')
-rw-r--r-- | source3/smbd/globals.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index d6c618f405f..6c1efaf44bd 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -354,8 +354,19 @@ struct smbXsrv_connection { uint64_t smbd_idle_profstamp; + /* + * this session_table is used for SMB1 and SMB2, + */ struct smbXsrv_session_table *session_table; + /* + * this tcon_table is only used for SMB1. + */ struct smbXsrv_tcon_table *tcon_table; + /* + * this open_table is used for SMB1 and SMB2, + * because we have a global sconn->real_max_open_files + * limit. + */ struct smbXsrv_open_table *open_table; }; @@ -552,11 +563,8 @@ struct smbd_server_connection { size_t num_files; struct files_struct *files; - struct bitmap *file_bmap; int real_max_open_files; struct fsp_singleton_cache fsp_fi_cache; - unsigned long file_gen_counter; - int first_file; struct pending_message_list *deferred_open_queue; |