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

diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index bde66dc87909471bd4470f666409764a1daef1fd..e7898f89c714122d73dae291693210e4684aa42e 100644 (file)
--- 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 1769ec20c4f4a14dfe15488885f7b2f27950f685..22575be4694b2a4cd55232b903026fa8e1d48ef6 100644 (file)
--- 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 99dcf43edb4cc4faf8b071c3b4fd5751383165ad..be1bfdb7d1e45aa4683157ad51804570c1df9fd2 100644 (file)
--- 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)