sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

smbd: s/FILE_ATTRIBUTES_INVALID/FILE_ATTRIBUTE_INVALID/g

Browse Source 
No idea what got me into having an "S" in the define when I added it.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2023-10-31 10:05:30 +01:00 committed by Jeremy Allison
parent 4c91f8ac2a
commit ddc9cb779f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcli/smb/smb_constants.h
View File

@ -329,7 +329,7 @@ enum csc_policy {
#define FLAGS2_UNICODE_STRINGS 0x8000 #define FLAGS2_UNICODE_STRINGS 0x8000
/* FileAttributes (search attributes) field */ /* FileAttributes (search attributes) field */
#define FILE_ATTRIBUTES_INVALID 0x0000L #define FILE_ATTRIBUTE_INVALID 0x0000L
#define FILE_ATTRIBUTE_READONLY 0x0001L #define FILE_ATTRIBUTE_READONLY 0x0001L
#define FILE_ATTRIBUTE_HIDDEN 0x0002L #define FILE_ATTRIBUTE_HIDDEN 0x0002L
#define FILE_ATTRIBUTE_SYSTEM 0x0004L #define FILE_ATTRIBUTE_SYSTEM 0x0004L

2
source3/include/smb_macros.h
View File

@ -103,7 +103,7 @@
#define VALID_STAT_OF_DIR(st) (VALID_STAT(st) && S_ISDIR((st).st_ex_mode)) #define VALID_STAT_OF_DIR(st) (VALID_STAT(st) && S_ISDIR((st).st_ex_mode))
#define SET_STAT_INVALID(st) { \ #define SET_STAT_INVALID(st) { \
(st).st_ex_nlink = 0; \ (st).st_ex_nlink = 0; \
(st).cached_dos_attributes = FILE_ATTRIBUTES_INVALID; \ (st).cached_dos_attributes = FILE_ATTRIBUTE_INVALID; \
}; };
/* Macros to get at offsets within smb_lkrng and smb_unlkrng /* Macros to get at offsets within smb_lkrng and smb_unlkrng

2
source3/smbd/dosmode.c
View File

@ -710,7 +710,7 @@ uint32_t fdos_mode(struct files_struct *fsp)
return FILE_ATTRIBUTE_NORMAL; return FILE_ATTRIBUTE_NORMAL;
} }
if (fsp->fsp_name->st.cached_dos_attributes != FILE_ATTRIBUTES_INVALID) { if (fsp->fsp_name->st.cached_dos_attributes != FILE_ATTRIBUTE_INVALID) {
return fsp->fsp_name->st.cached_dos_attributes; return fsp->fsp_name->st.cached_dos_attributes;
} }

8
source3/smbd/files.c
View File

@ -2038,7 +2038,7 @@ files_struct *file_fsp(struct smb_request *req, uint16_t fid)
} }
req->chain_fsp = fsp; req->chain_fsp = fsp;
fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTES_INVALID; fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTE_INVALID;
return fsp; return fsp;
} }
@ -2085,7 +2085,7 @@ struct files_struct *file_fsp_get(struct smbd_smb2_request *smb2req,
return NULL; return NULL;
} }
fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTES_INVALID; fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTE_INVALID;
return fsp; return fsp;
} }
@ -2101,7 +2101,7 @@ struct files_struct *file_fsp_smb2(struct smbd_smb2_request *smb2req,
return NULL; return NULL;
} }
smb2req->compat_chain_fsp->fsp_name->st.cached_dos_attributes = smb2req->compat_chain_fsp->fsp_name->st.cached_dos_attributes =
FILE_ATTRIBUTES_INVALID; FILE_ATTRIBUTE_INVALID;
return smb2req->compat_chain_fsp; return smb2req->compat_chain_fsp;
} }
@ -2231,7 +2231,7 @@ static NTSTATUS fsp_attach_smb_fname(struct files_struct *fsp,
fsp->name_hash = name_hash; fsp->name_hash = name_hash;
fsp->fsp_name = smb_fname_new; fsp->fsp_name = smb_fname_new;
fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTES_INVALID; fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTE_INVALID;
*_smb_fname = NULL; *_smb_fname = NULL;
return NT_STATUS_OK; return NT_STATUS_OK;
} }