smbd: s/FILE_ATTRIBUTES_INVALID/FILE_ATTRIBUTE_INVALID/g

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>

diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index ead047d924fcdb90923a924be811b58fe7b4ae8e..1d55a555157a1d530c0a1e4a6a4d300f5fd1578d 100644 (file)
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -329,7 +329,7 @@ enum csc_policy {
 #define FLAGS2_UNICODE_STRINGS         0x8000
 
 /* FileAttributes (search attributes) field */
-#define FILE_ATTRIBUTES_INVALID        0x0000L
+#define FILE_ATTRIBUTE_INVALID                 0x0000L
 #define FILE_ATTRIBUTE_READONLY                0x0001L
 #define FILE_ATTRIBUTE_HIDDEN          0x0002L
 #define FILE_ATTRIBUTE_SYSTEM          0x0004L

diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index f9aaf786ed38f645cdca0bd894aa683ece35f64f..3a942f9df1179e2ed3bccb95fe6da7fc0e93d268 100644 (file)
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -103,7 +103,7 @@
 #define VALID_STAT_OF_DIR(st) (VALID_STAT(st) && S_ISDIR((st).st_ex_mode))
 #define SET_STAT_INVALID(st) { \
                (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

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index c76a27dc71d1564c95591302c053e87033e948c7..b388b5dc5813c0bc684bba5fea53ff273e66b120 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -710,7 +710,7 @@ uint32_t fdos_mode(struct files_struct *fsp)
                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;
        }
 

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 1bbf822df286b05d6c7a9e334db5b616dd6f81c1..0c54ca3746840154460938f054314287abac8d8e 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -2038,7 +2038,7 @@ files_struct *file_fsp(struct smb_request *req, uint16_t fid)
        }
 
        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;
 }
 
@@ -2085,7 +2085,7 @@ struct files_struct *file_fsp_get(struct smbd_smb2_request *smb2req,
                return NULL;
        }
 
-       fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTES_INVALID;
+       fsp->fsp_name->st.cached_dos_attributes = FILE_ATTRIBUTE_INVALID;
 
        return fsp;
 }
@@ -2101,7 +2101,7 @@ struct files_struct *file_fsp_smb2(struct smbd_smb2_request *smb2req,
                        return NULL;
                }
                smb2req->compat_chain_fsp->fsp_name->st.cached_dos_attributes =
-                       FILE_ATTRIBUTES_INVALID;
+                       FILE_ATTRIBUTE_INVALID;
                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->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;
        return NT_STATUS_OK;
 }