From 9f75b7cbb3d25b3a799f0dc50587260036e40719 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 29 Apr 2011 11:25:56 +1000 Subject: libcli/smb Move FILE_ATTRIBUTE defines to the top level --- source4/libcli/raw/smb.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'source4/libcli/raw/smb.h') diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h index 05bf91fe3b..c3fdbbba23 100644 --- a/source4/libcli/raw/smb.h +++ b/source4/libcli/raw/smb.h @@ -366,24 +366,6 @@ #define DESIRED_ACCESS_PIPE 0x2019f -/* FileAttributes (search attributes) field */ -#define FILE_ATTRIBUTE_READONLY 0x0001 -#define FILE_ATTRIBUTE_HIDDEN 0x0002 -#define FILE_ATTRIBUTE_SYSTEM 0x0004 -#define FILE_ATTRIBUTE_VOLUME 0x0008 -#define FILE_ATTRIBUTE_DIRECTORY 0x0010 -#define FILE_ATTRIBUTE_ARCHIVE 0x0020 -#define FILE_ATTRIBUTE_DEVICE 0x0040 -#define FILE_ATTRIBUTE_NORMAL 0x0080 -#define FILE_ATTRIBUTE_TEMPORARY 0x0100 -#define FILE_ATTRIBUTE_SPARSE 0x0200 -#define FILE_ATTRIBUTE_REPARSE_POINT 0x0400 -#define FILE_ATTRIBUTE_COMPRESSED 0x0800 -#define FILE_ATTRIBUTE_OFFLINE 0x1000 -#define FILE_ATTRIBUTE_NONINDEXED 0x2000 -#define FILE_ATTRIBUTE_ENCRYPTED 0x4000 -#define FILE_ATTRIBUTE_ALL_MASK 0x7FFF - /* Flags - combined with attributes. */ #define FILE_FLAG_WRITE_THROUGH 0x80000000L #define FILE_FLAG_NO_BUFFERING 0x20000000L -- cgit From 39ded87b45851894f157d2cc800feb402e650420 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 2 May 2011 11:34:57 +1000 Subject: libcli/raw: use a different ifdef than s3 smb.h this allows both headers to be included in 1 C file Pair-Programmed-With: Andrew Bartlett --- source4/libcli/raw/smb.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/libcli/raw/smb.h') diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h index c3fdbbba23..f1d0bfd294 100644 --- a/source4/libcli/raw/smb.h +++ b/source4/libcli/raw/smb.h @@ -23,8 +23,8 @@ along with this program. If not, see . */ -#ifndef _SMB_H -#define _SMB_H +#ifndef _RAW_SMB_H +#define _RAW_SMB_H /* deny modes */ #define DENY_DOS 0 @@ -582,4 +582,4 @@ #include "libcli/raw/interfaces.h" #include "libcli/smb/smb_common.h" -#endif /* _SMB_H */ +#endif /* _RAW_SMB_H */ -- cgit From 4f41be356a4e6b311d30de3b2e36e4c33aa72ca3 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 5 May 2011 10:41:59 -0700 Subject: Fix many const compiler warnings. --- source4/libcli/raw/smb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/libcli/raw/smb.h') diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h index f1d0bfd294..008ab57c0d 100644 --- a/source4/libcli/raw/smb.h +++ b/source4/libcli/raw/smb.h @@ -454,7 +454,7 @@ /* where to find the base of the SMB packet proper */ /* REWRITE TODO: smb_base needs to be removed */ -#define smb_base(buf) (((char *)(buf))+4) +#define smb_base(buf) (((const char *)(buf))+4) /* we don't allow server strings to be longer than 48 characters as otherwise NT will not honour the announce packets */ -- cgit