Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest

[bbaumbach/samba-autobuild/.git] / source4 / auth / gensec / gensec.h

diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 7a1abfbc3b9a45c61f8b01c842861fab34f557b9..0b31882ddd6865d95b4f2fc63018393ce5a3de2b 100644 (file)
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -52,6 +52,8 @@ struct gensec_target {
 #define GENSEC_FEATURE_DCE_STYLE       0x00000008
 #define GENSEC_FEATURE_ASYNC_REPLIES   0x00000010
 #define GENSEC_FEATURE_DATAGRAM_MODE   0x00000020
+#define GENSEC_FEATURE_SIGN_PKT_HEADER 0x00000040
+#define GENSEC_FEATURE_NEW_SPNEGO      0x00000080
 
 /* GENSEC mode */
 enum gensec_role
@@ -131,6 +133,8 @@ struct gensec_security_ops {
        NTSTATUS (*session_key)(struct gensec_security *gensec_security, DATA_BLOB *session_key);
        NTSTATUS (*session_info)(struct gensec_security *gensec_security, 
                                 struct auth_session_info **session_info); 
+       void (*want_feature)(struct gensec_security *gensec_security,
+                                   uint32_t feature);
        bool (*have_feature)(struct gensec_security *gensec_security,
                                    uint32_t feature); 
        bool enabled;
@@ -172,6 +176,7 @@ struct gensec_security;
 struct socket_context;
 
 NTSTATUS gensec_socket_init(struct gensec_security *gensec_security,
+                           TALLOC_CTX *mem_ctx, 
                            struct socket_context *current_socket,
                            struct event_context *ev,
                            void (*recv_handler)(void *, uint16_t),