Add missing defines for ACL query support
Subsystems (2)
PATCH 1/3 Add missing defines for ACL query support
Add missing defines needed for ACL query support.
For definitions of these security info type additionalinfo flags and also the EA Flags see MS-SMB2 (2.2.37) or MS-DTYP
Signed-of-by Steven French <[email protected]>
Reviewed-by Shirish Pargaonkar <[email protected]>
--- fs/cifs/smb2pdu.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
fs/cifs/smb2pdu.h +19 -0
@@ -836,6 +836,25 @@ struct smb2_query_directory_rsp {#define SMB2_O_INFO_SECURITY 0x03#define SMB2_O_INFO_QUOTA 0x04 +/* Security info type additionalinfo flags. See MS-SMB2 (2.2.37) or MS-DTYP */ +#define OWNER_SECINFO 0x00000001 +#define GROUP_SECINFO 0x00000002 +#define DACL_SECINFO 0x00000004 +#define SACL_SECINFO 0x00000008 +#define LABEL_SECINFO 0x00000010 +#define ATTRIBUTE_SECINFO 0x00000020 +#define SCOPE_SECINFO 0x00000040 +#define BACKUP_SECINFO 0x00010000 +#define UNPROTECTED_SACL_SECINFO 0x10000000 +#define UNPROTECTED_DACL_SECINFO 0x20000000 +#define PROTECTED_SACL_SECINFO 0x40000000 +#define PROTECTED_DACL_SECINFO 0x80000000 + +/* Flags used for FileFullEAinfo */ +#define SL_RESTART_SCAN 0x00000001 +#define SL_RETURN_SINGLE_ENTRY 0x00000002 +#define SL_INDEX_SPECIFIED 0x00000004 +struct smb2_query_info_req {struct smb2_hdr hdr;__le16 StructureSize;/* Must be 41 */
Signature · 1 line
1.9.1
A message that is not in the archive (sent off-list or not yet received): 1413835743-13566-1-git-send-email-smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 2/3 decode_negTokenInit had wrong calling sequence
For krb5 enablement of SMB3, decoding negprot, caller now passes server struct not the old sec_type
--- fs/cifs/smb2pdu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/cifs/smb2pdu.c +1 -2
@@ -431,8 +431,7 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)if (rc) goto neg_exit;if (blob_length) - rc =decode_neg_token_init (security_blob, blob_length, - &server->sec_type); + rc =decode_negTokenInit (security_blob, blob_length, server);if (rc ==1 ) rc =0 ;else if (rc ==0 ) {
Signature · 1 line
1.9.1
PATCH 3/3 Update modinfo cifs version for cifs.ko
In reply to a message not in the archiveupdate cifs version to 2.06
Signed-off-by Steve French <[email protected]>
--- fs/cifs/cifsfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/cifsfs.h +1 -1
@@ -136,5 +136,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);extern const struct export_operations cifs_export_ops;#endif /* CONFIG_CIFS_NFSD_EXPORT */ -#define CIFS_VERSION "2.05" +#define CIFS_VERSION "2.06"#endif /* _CIFSFS_H */
Signature · 1 line
1.9.1