sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

smbd: Make "share_mode_flags" 16-bit wide

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2019-08-09 16:16:21 +02:00 committed by Jeremy Allison
parent 9c99675bcb
commit 86b4907853
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/vfs.h
View File

@ -396,7 +396,7 @@ typedef struct files_struct {
* Cache of share_mode_data->flags
*/
int share_mode_flags_seqnum;
uint8_t share_mode_flags;
uint16_t share_mode_flags;
/*
* Read-only cached brlock record, thrown away when the

2
source3/librpc/idl/open_files.idl
View File

@ -40,7 +40,7 @@ interface open_files
security_unix_token *delete_token;
} delete_token;
typedef [public,bitmap8bit] bitmap {
typedef [public,bitmap16bit] bitmap {
SHARE_MODE_HAS_READ_LEASE = 0x01
} share_mode_flags;

8
source3/locking/share_mode_lock.c
View File

@ -210,17 +210,17 @@ static void share_mode_memcache_store(struct share_mode_data *d)
*/
static enum ndr_err_code get_share_mode_blob_header(
DATA_BLOB *blob, uint64_t *pseq, uint8_t *pflags)
DATA_BLOB *blob, uint64_t *pseq, uint16_t *pflags)
{
struct ndr_pull ndr = {.data = blob->data, .data_size = blob->length};
NDR_CHECK(ndr_pull_hyper(&ndr, NDR_SCALARS, pseq));
NDR_CHECK(ndr_pull_uint8(&ndr, NDR_SCALARS, pflags));
NDR_CHECK(ndr_pull_uint16(&ndr, NDR_SCALARS, pflags));
return NDR_ERR_SUCCESS;
}
struct fsp_update_share_mode_flags_state {
enum ndr_err_code ndr_err;
uint8_t share_mode_flags;
uint16_t share_mode_flags;
};
static void fsp_update_share_mode_flags_fn(
@ -290,7 +290,7 @@ static struct share_mode_data *share_mode_memcache_fetch(TALLOC_CTX *mem_ctx,
enum ndr_err_code ndr_err;
struct share_mode_data *d;
uint64_t sequence_number;
uint8_t flags;
uint16_t flags;
void *ptr;
struct file_id id;
DATA_BLOB key;