From 1d16f750515bcf49e0dc87394479dc56e7192538 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 26 May 1998 19:37:31 +0000 Subject: smb.h: More NT SMB stuff (just defines). smbpass.c: Do *NOT* make this function static. It breaks the compile on gcc util.c: Getting closer to MS wildcard semantics. A trailing '*' matches any trailing dot-separated components. trans2.c: Removed hacks that change multiple '?' -> '*' as this breaks things now. trans2.h: Removed NT_FILE_ATTRIBUTE_NORMAL - now FILE_ATTRIBUTE_NORMAL is defined in smb.h. Jeremy. (This used to be commit 42a65511068cd9006350c80bbed2f346f3f01cb0) --- source3/include/smb.h | 9 +++++++++ source3/include/trans2.h | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'source3/include') diff --git a/source3/include/smb.h b/source3/include/smb.h index 31935b636d..0382cf2c71 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1037,6 +1037,15 @@ struct parm_struct /* DesiredAccess */ #if 0 /* TODO.... JRA */ +#define SPECIFIC_RIGHTS_MASK 0x00FFFFL +#define STANDARD_RIGHTS_MASK 0xFF0000L +#define DELETE_ACCESS (1L<<16) +#define READ_CONTROL_ACCESS (1L<<17) +#define WRITE_DAC_ACCESS (1L<<18) +#define WRITE_OWNER_ACCESS (1L<<19) +#define SYNCHRONIZE_ACCESS (1L<<20) +#define SYSTEM_SECURITY_ACCESS (1L<<24) + #define GENERIC_READ xxx? #define GENERIC_WRITE xxx? #endif diff --git a/source3/include/trans2.h b/source3/include/trans2.h index 62b6a1a9bf..894823602e 100644 --- a/source3/include/trans2.h +++ b/source3/include/trans2.h @@ -233,11 +233,6 @@ Byte offset Type name description #define DIRLEN_GUESS (45+MAX(l1_achName,l2_achName)) -/* NT uses a FILE_ATTRIBUTE_NORMAL when no other attributes - are set. */ - -#define NT_FILE_ATTRIBUTE_NORMAL 0x80 - #endif -- cgit