summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-26 09:28:10 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-26 11:27:12 +0200
commit0d9bd56afb8ecb1d42fad4f344b1892bf01b153e (patch)
treec4fb41e79df0d749d989712274095d66874f6855
parent44689b1ee78e9197db5ef041dbc5e0e2aa8e61f7 (diff)
downloadsamba-0d9bd56afb8ecb1d42fad4f344b1892bf01b153e.tar.gz
samba-0d9bd56afb8ecb1d42fad4f344b1892bf01b153e.tar.bz2
samba-0d9bd56afb8ecb1d42fad4f344b1892bf01b153e.zip
libcli/smb: merge NEGOTIATE_SECURITY_* flags to smb_constants.h
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Wed Oct 26 11:27:12 CEST 2011 on sn-devel-104
-rw-r--r--libcli/smb/smb_constants.h6
-rw-r--r--source3/include/smb.h6
-rw-r--r--source4/libcli/raw/smb.h6
3 files changed, 6 insertions, 12 deletions
diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index bde66dc879..e7898f89c7 100644
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -196,6 +196,12 @@ enum smb_signing_setting {
/* used to indicate end of chain */
#define SMB_CHAIN_NONE 0xFF
+/* Sercurity mode bits. */
+#define NEGOTIATE_SECURITY_USER_LEVEL 0x01
+#define NEGOTIATE_SECURITY_CHALLENGE_RESPONSE 0x02
+#define NEGOTIATE_SECURITY_SIGNATURES_ENABLED 0x04
+#define NEGOTIATE_SECURITY_SIGNATURES_REQUIRED 0x08
+
/* Capabilities. see ftp.microsoft.com/developr/drg/cifs/cifs/cifs4.txt */
#define CAP_RAW_MODE 0x00000001
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 1769ec20c4..22575be469 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1067,12 +1067,6 @@ char *strdup(char *s);
#define BROWSER_ELECTION_VERSION 0x010f
#define BROWSER_CONSTANT 0xaa55
-/* Sercurity mode bits. */
-#define NEGOTIATE_SECURITY_USER_LEVEL 0x01
-#define NEGOTIATE_SECURITY_CHALLENGE_RESPONSE 0x02
-#define NEGOTIATE_SECURITY_SIGNATURES_ENABLED 0x04
-#define NEGOTIATE_SECURITY_SIGNATURES_REQUIRED 0x08
-
/* TCONX Flag (smb_vwv2). */
#define TCONX_FLAG_EXTENDED_RESPONSE 0x8
diff --git a/source4/libcli/raw/smb.h b/source4/libcli/raw/smb.h
index 99dcf43edb..be1bfdb7d1 100644
--- a/source4/libcli/raw/smb.h
+++ b/source4/libcli/raw/smb.h
@@ -337,12 +337,6 @@
#define BROWSER_ELECTION_VERSION 0x010f
#define BROWSER_CONSTANT 0xaa55
-/* Sercurity mode bits. */
-#define NEGOTIATE_SECURITY_USER_LEVEL 0x01
-#define NEGOTIATE_SECURITY_CHALLENGE_RESPONSE 0x02
-#define NEGOTIATE_SECURITY_SIGNATURES_ENABLED 0x04
-#define NEGOTIATE_SECURITY_SIGNATURES_REQUIRED 0x08
-
/*
* Global value meaning that the smb_uid field should be
* ingored (in share level security and protocol level == CORE)