s3-dcerpc: remove auth_data_free_func

[nivanova/samba-autobuild/.git] / source3 / include / ntdomain.h

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index f42ff587ffa498103e0ef8f36d3893c4f3aaac36..ba4f3928d68a87809e10d08e7ef54459079931d4 100644 (file)
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -93,34 +93,20 @@ typedef struct pipe_rpc_fns {
  * Can't keep in sync with wire values as spnego wraps different auth methods.
  */
 
-enum pipe_auth_type_spnego {
-       PIPE_AUTH_TYPE_SPNEGO_NONE = 0,
-       PIPE_AUTH_TYPE_SPNEGO_NTLMSSP,
-       PIPE_AUTH_TYPE_SPNEGO_KRB5
-};
-
 struct gse_context;
 
 /* auth state for all bind types. */
 
 struct pipe_auth_data {
        enum dcerpc_AuthType auth_type;
-       enum pipe_auth_type_spnego spnego_type; /* used by server only */
        enum dcerpc_AuthLevel auth_level;
 
-       union {
-               struct schannel_state *schannel_auth;
-               struct auth_ntlmssp_state *auth_ntlmssp_state;
-               struct gse_context *gssapi_state;
-               struct spnego_context *spnego_state;
-       } a_u;
+       void *auth_ctx;
 
        /* Only the client code uses these 3 for now */
        char *domain;
        char *user_name;
        DATA_BLOB user_session_key;
-
-       void (*auth_data_free_func)(struct pipe_auth_data *);
 };
 
 /*
@@ -131,9 +117,10 @@ struct pipe_auth_data {
 struct pipes_struct {
        struct pipes_struct *next, *prev;
 
-       char client_address[INET6_ADDRSTRLEN];
+       struct client_address *client_id;
 
        struct auth_serversupplied_info *server_info;
+       struct messaging_context *msg_ctx;
 
        struct ndr_syntax_id syntax;