diff options
| author | Günther Deschner <gd@samba.org> | 2009-08-12 20:22:04 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-08-28 10:08:52 +0200 |
| commit | 25d6c0a51813928a7ef343a1d5411247212a0bc6 (patch) | |
| tree | 2158ad1edd441c09f90d00396f0a58da79d63384 /source3/include | |
| parent | 3a519fac8a1bf352fc8895458d4d27311a215c81 (diff) | |
| download | samba-25d6c0a51813928a7ef343a1d5411247212a0bc6.tar.gz samba-25d6c0a51813928a7ef343a1d5411247212a0bc6.tar.bz2 samba-25d6c0a51813928a7ef343a1d5411247212a0bc6.zip | |
s3-ntlmssp: use NTLMSSP headers from IDL and remove duplicate constants.
Guenther
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/ntlmssp.h | 29 | ||||
| -rw-r--r-- | source3/include/rpc_dce.h | 3 | ||||
| -rw-r--r-- | source3/include/smb.h | 1 |
3 files changed, 1 insertions, 32 deletions
diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h index 1662eaa616..9f47c9c555 100644 --- a/source3/include/ntlmssp.h +++ b/source3/include/ntlmssp.h @@ -37,39 +37,10 @@ enum NTLM_MESSAGE_TYPE NTLMSSP_DONE = 5 /* samba final state */ }; -/* NTLMSSP negotiation flags */ -#define NTLMSSP_NEGOTIATE_UNICODE 0x00000001 -#define NTLMSSP_NEGOTIATE_OEM 0x00000002 -#define NTLMSSP_REQUEST_TARGET 0x00000004 -#define NTLMSSP_NEGOTIATE_SIGN 0x00000010 /* Message integrity */ -#define NTLMSSP_NEGOTIATE_SEAL 0x00000020 /* Message confidentiality */ -#define NTLMSSP_NEGOTIATE_DATAGRAM_STYLE 0x00000040 -#define NTLMSSP_NEGOTIATE_LM_KEY 0x00000080 -#define NTLMSSP_NEGOTIATE_NETWARE 0x00000100 -#define NTLMSSP_NEGOTIATE_NTLM 0x00000200 -#define NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED 0x00001000 -#define NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED 0x00002000 -#define NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL 0x00004000 -#define NTLMSSP_NEGOTIATE_ALWAYS_SIGN 0x00008000 -#define NTLMSSP_TARGET_TYPE_DOMAIN 0x10000 -#define NTLMSSP_TARGET_TYPE_SERVER 0x20000 -#define NTLMSSP_CHAL_INIT_RESPONSE 0x00010000 - -#define NTLMSSP_CHAL_ACCEPT_RESPONSE 0x00020000 -#define NTLMSSP_CHAL_NON_NT_SESSION_KEY 0x00040000 -#define NTLMSSP_NEGOTIATE_NTLM2 0x00080000 -#define NTLMSSP_CHAL_TARGET_INFO 0x00800000 -#define NTLMSSP_NEGOTIATE_VERSION 0x02000000 -#define NTLMSSP_NEGOTIATE_128 0x20000000 /* 128-bit encryption */ -#define NTLMSSP_NEGOTIATE_KEY_EXCH 0x40000000 -#define NTLMSSP_NEGOTIATE_56 0x80000000 - #define NTLMSSP_FEATURE_SESSION_KEY 0x00000001 #define NTLMSSP_FEATURE_SIGN 0x00000002 #define NTLMSSP_FEATURE_SEAL 0x00000004 -#define NTLMSSP_SIG_SIZE 16 - typedef struct ntlmssp_state { unsigned int ref_count; diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h index 50ca9800d1..3dfbc1672e 100644 --- a/source3/include/rpc_dce.h +++ b/source3/include/rpc_dce.h @@ -56,9 +56,6 @@ enum RPC_PKT_TYPE { #define SMBD_NTLMSSP_NEG_FLAGS 0x000082b1 /* ALWAYS_SIGN|NEG_NTLM|NEG_LM|NEG_SEAL|NEG_SIGN|NEG_UNICODE */ -/* NTLMSSP signature version */ -#define NTLMSSP_SIGN_VERSION 0x01 - /* DCE RPC auth types - extended by Microsoft. */ #define RPC_ANONYMOUS_AUTH_TYPE 0 #define RPC_AUTH_TYPE_KRB5_1 1 diff --git a/source3/include/smb.h b/source3/include/smb.h index 3f3d7e6abc..f8816b6bc5 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -253,6 +253,7 @@ struct id_map { #include "librpc/gen_ndr/spoolss.h" #include "librpc/gen_ndr/dcerpc.h" #include "librpc/gen_ndr/ndr_dcerpc.h" +#include "librpc/gen_ndr/ntlmssp.h" struct lsa_dom_info { bool valid; |