s4: include ntlmssp header in auth/ntlmssp/ntlmssp.h.

[ira/wip.git] / source4 / auth / ntlmssp / ntlmssp.h

diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h
index a9ad988a5ff73f51371c406a0f7b536818495162..7743e7697e1c36145c8312a818df3bb94fc47f9e 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp.h
+++ b/source4/auth/ntlmssp/ntlmssp.h
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,11 +16,11 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "librpc/gen_ndr/samr.h"
+#include "../librpc/gen_ndr/ntlmssp.h"
 
 /* NTLMSSP mode */
 enum ntlmssp_role
@@ -40,42 +40,6 @@ enum ntlmssp_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_UNKNOWN_02000000           0x02000000
-#define NTLMSSP_NEGOTIATE_128              0x20000000 /* 128-bit encryption */
-#define NTLMSSP_NEGOTIATE_KEY_EXCH         0x40000000
-#define NTLMSSP_NEGOTIATE_56               0x80000000
-
-#define NTLMSSP_NAME_TYPE_SERVER      0x01
-#define NTLMSSP_NAME_TYPE_DOMAIN      0x02
-#define NTLMSSP_NAME_TYPE_SERVER_DNS  0x03
-#define NTLMSSP_NAME_TYPE_DOMAIN_DNS  0x04
-
-#define NTLMSSP_SIGN_VERSION 1
-
-#define NTLMSSP_SIG_SIZE 16
-
 struct gensec_ntlmssp_state
 {
        struct gensec_security *gensec_security;
@@ -84,17 +48,17 @@ struct gensec_ntlmssp_state
        enum samr_Role server_role;
        uint32_t expected_state;
 
-       BOOL unicode;
-       BOOL use_ntlmv2;
-       BOOL use_nt_response;  /* Set to 'False' to debug what happens when the NT response is omited */
-       BOOL allow_lm_key;     /* The LM_KEY code is not functional at this point, and it's not 
+       bool unicode;
+       bool use_ntlmv2;
+       bool use_nt_response;  /* Set to 'False' to debug what happens when the NT response is omited */
+       bool allow_lm_key;     /* The LM_KEY code is not functional at this point, and it's not 
                                  very secure anyway */
 
-       BOOL server_multiple_authentications;  /* Set to 'True' to allow squid 2.5 
+       bool server_multiple_authentications;  /* Set to 'True' to allow squid 2.5 
                                                  style 'challenge caching' */
 
        char *user;
-       char *domain;
+       const char *domain;
        const char *workstation;
        char *server_domain;
 
@@ -129,7 +93,7 @@ struct gensec_ntlmssp_state
         * @return Can the challenge be set to arbitary values?
         *
         */
-       BOOL (*may_set_challenge)(const struct gensec_ntlmssp_state *);
+       bool (*may_set_challenge)(const struct gensec_ntlmssp_state *);
 
        /**
         * Callback to set the 'challenge' used for NTLM authentication.  
@@ -157,9 +121,8 @@ struct gensec_ntlmssp_state
                                   DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key);
 
        const char *server_name;
-       const char *(*get_domain)(void);
 
-       BOOL doing_ntlm2; 
+       bool doing_ntlm2; 
 
        union {
                /* NTLM */
@@ -186,5 +149,7 @@ struct gensec_ntlmssp_state
        struct auth_serversupplied_info *server_info;
 };
 
+struct loadparm_context;
 struct auth_session_info;
+
 #include "auth/ntlmssp/proto.h"