[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-900-gaef96af
Stefan Metzmacher
metze at samba.org
Fri Aug 7 06:56:48 MDT 2009
The branch, master has been updated
via aef96af916eab4c29656d3ff6426618f331b7400 (commit)
via acbb9da53077756f6a44a4737fcd3329fadb217c (commit)
via c2c4d489b685534a3fa879f993d0f4931c6cf44e (commit)
via 21d6f276fbb4f4c345c5bd9d4d0ee058cae7ea0b (commit)
via 93ec5d27e46c4182a8c2913b1bc2757db1b7860b (commit)
from 50f54250f4b566e10d0be40dc2d0117c6cb7a73d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit aef96af916eab4c29656d3ff6426618f331b7400
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Aug 7 14:12:19 2009 +0200
s4:libcli/smb2: move SMB2_GETINFO_* flags into smb2_constants.h
metze
commit acbb9da53077756f6a44a4737fcd3329fadb217c
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Aug 7 14:11:11 2009 +0200
s4:libcli/smb2: remove unused and redundant SMB2 security flags
metze
commit c2c4d489b685534a3fa879f993d0f4931c6cf44e
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Aug 7 14:09:42 2009 +0200
s4:libcli: move SMB2 Find constants to smb2_constants.h
metze
commit 21d6f276fbb4f4c345c5bd9d4d0ee058cae7ea0b
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Aug 7 14:55:37 2009 +0200
s4:libcli/raw: we don't need to include "smb.h" explicit
metze
commit 93ec5d27e46c4182a8c2913b1bc2757db1b7860b
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Aug 7 14:55:01 2009 +0200
s4:libcli/raw: also include smb2_constants.h into interfaces.h
metze
-----------------------------------------------------------------------
Summary of changes:
source4/libcli/raw/interfaces.h | 19 ++-----------------
source4/libcli/raw/raweas.c | 1 -
source4/libcli/raw/rawfile.c | 1 -
source4/libcli/raw/rawlpq.c | 1 -
source4/libcli/raw/smb_signing.c | 1 -
source4/libcli/smb2/smb2_calls.h | 12 ------------
source4/libcli/smb2/smb2_constants.h | 22 ++++++++++++++++++++++
7 files changed, 24 insertions(+), 33 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 478b658..75b7175 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -22,7 +22,8 @@
#ifndef __LIBCLI_RAW_INTERFACES_H__
#define __LIBCLI_RAW_INTERFACES_H__
-#include "smb.h"
+#include "libcli/raw/smb.h"
+#include "libcli/smb2/smb2_constants.h"
#include "librpc/gen_ndr/misc.h" /* for struct GUID */
/* this structure is just a wrapper for a string, the only reason we
@@ -2447,22 +2448,6 @@ union smb_search_first {
} out;
} t2ffirst;
-/*
- SMB2 uses different level numbers for the same old SMB trans2 search levels
-*/
-#define SMB2_FIND_DIRECTORY_INFO 0x01
-#define SMB2_FIND_FULL_DIRECTORY_INFO 0x02
-#define SMB2_FIND_BOTH_DIRECTORY_INFO 0x03
-#define SMB2_FIND_NAME_INFO 0x0C
-#define SMB2_FIND_ID_BOTH_DIRECTORY_INFO 0x25
-#define SMB2_FIND_ID_FULL_DIRECTORY_INFO 0x26
-
-/* flags for SMB2 find */
-#define SMB2_CONTINUE_FLAG_RESTART 0x01
-#define SMB2_CONTINUE_FLAG_SINGLE 0x02
-#define SMB2_CONTINUE_FLAG_INDEX 0x04
-#define SMB2_CONTINUE_FLAG_REOPEN 0x10
-
/* SMB2 Find */
struct smb2_find {
enum smb_search_level level;
diff --git a/source4/libcli/raw/raweas.c b/source4/libcli/raw/raweas.c
index 09fd4aa..ae3d4ce 100644
--- a/source4/libcli/raw/raweas.c
+++ b/source4/libcli/raw/raweas.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "smb.h"
#include "libcli/raw/libcliraw.h"
#include "libcli/raw/raw_proto.h"
diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index 6fac7b8..35d6b75 100644
--- a/source4/libcli/raw/rawfile.c
+++ b/source4/libcli/raw/rawfile.c
@@ -20,7 +20,6 @@
*/
#include "includes.h"
-#include "smb.h"
#include "libcli/raw/libcliraw.h"
#include "libcli/raw/raw_proto.h"
#include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/libcli/raw/rawlpq.c b/source4/libcli/raw/rawlpq.c
index eddb3e0..5c44772 100644
--- a/source4/libcli/raw/rawlpq.c
+++ b/source4/libcli/raw/rawlpq.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "smb.h"
#include "libcli/raw/libcliraw.h"
#include "libcli/raw/raw_proto.h"
diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
index 9f94039..84e0ad6 100644
--- a/source4/libcli/raw/smb_signing.c
+++ b/source4/libcli/raw/smb_signing.c
@@ -20,7 +20,6 @@
*/
#include "includes.h"
-#include "smb.h"
#include "libcli/raw/libcliraw.h"
#include "libcli/raw/raw_proto.h"
#include "../lib/crypto/crypto.h"
diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h
index b89770f..bea0573 100644
--- a/source4/libcli/smb2/smb2_calls.h
+++ b/source4/libcli/smb2/smb2_calls.h
@@ -52,18 +52,6 @@ struct smb2_negprot {
} out;
};
-/* getinfo classes */
-#define SMB2_GETINFO_FILE 0x01
-#define SMB2_GETINFO_FS 0x02
-#define SMB2_GETINFO_SECURITY 0x03
-#define SMB2_GETINFO_QUOTA 0x04
-
-#define SMB2_GETINFO_ADD_OWNER_SECURITY 0x01
-#define SMB2_GETINFO_ADD_GROUP_SECURITY 0x02
-#define SMB2_GETINFO_ADD_DACL_SECURITY 0x04
-#define SMB2_GETINFO_ADD_SACL_SECURITY 0x08
-#define SMB2_GETINFO_ADD_LABEL_SECURITY 0x10
-
/* NOTE! the getinfo fs and file levels exactly match up with the
'passthru' SMB levels, which are levels >= 1000. The SMB2 client
lib uses the names from the libcli/raw/ library */
diff --git a/source4/libcli/smb2/smb2_constants.h b/source4/libcli/smb2/smb2_constants.h
index f1681a3..3047809 100644
--- a/source4/libcli/smb2/smb2_constants.h
+++ b/source4/libcli/smb2/smb2_constants.h
@@ -150,4 +150,26 @@
#define SMB2_CREATE_OPTIONS_NOT_SUPPORTED_MASK (NTCREATEX_OPTIONS_TREE_CONNECTION | \
NTCREATEX_OPTIONS_OPFILTER)
+/*
+ SMB2 uses different level numbers for the same old SMB trans2 search levels
+*/
+#define SMB2_FIND_DIRECTORY_INFO 0x01
+#define SMB2_FIND_FULL_DIRECTORY_INFO 0x02
+#define SMB2_FIND_BOTH_DIRECTORY_INFO 0x03
+#define SMB2_FIND_NAME_INFO 0x0C
+#define SMB2_FIND_ID_BOTH_DIRECTORY_INFO 0x25
+#define SMB2_FIND_ID_FULL_DIRECTORY_INFO 0x26
+
+/* flags for SMB2 find */
+#define SMB2_CONTINUE_FLAG_RESTART 0x01
+#define SMB2_CONTINUE_FLAG_SINGLE 0x02
+#define SMB2_CONTINUE_FLAG_INDEX 0x04
+#define SMB2_CONTINUE_FLAG_REOPEN 0x10
+
+/* getinfo classes */
+#define SMB2_GETINFO_FILE 0x01
+#define SMB2_GETINFO_FS 0x02
+#define SMB2_GETINFO_SECURITY 0x03
+#define SMB2_GETINFO_QUOTA 0x04
+
#endif
--
Samba Shared Repository
More information about the samba-cvs
mailing list