s4-gensec: Remove obsolete socket_address vars and fns.

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

diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 0b31882ddd6865d95b4f2fc63018393ce5a3de2b..2ea2402064eb3dacd7b2e26e881539aab85716fa 100644 (file)
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -23,6 +23,9 @@
 #ifndef __GENSEC_H__
 #define __GENSEC_H__
 
+#include "../lib/util/data_blob.h"
+#include "libcli/util/ntstatus.h"
+
 #define GENSEC_OID_NTLMSSP "1.3.6.1.4.1.311.2.2.10"
 #define GENSEC_OID_SPNEGO "1.3.6.1.5.5.2"
 #define GENSEC_OID_KERBEROS5 "1.2.840.113554.1.2.2"
@@ -64,6 +67,8 @@ enum gensec_role
 
 struct auth_session_info;
 struct cli_credentials;
+struct gensec_settings;
+struct tevent_context;
 
 struct gensec_update_request {
        struct gensec_security *gensec_security;
@@ -77,6 +82,12 @@ struct gensec_update_request {
        } callback;
 };
 
+struct gensec_settings {
+       struct loadparm_context *lp_ctx;
+       struct smb_iconv_convenience *iconv_convenience;
+       const char *target_hostname;
+};
+
 struct gensec_security_ops {
        const char *name;
        const char *sasl_name;
@@ -151,16 +162,20 @@ struct gensec_security_ops_wrapper {
 
 struct gensec_security {
        const struct gensec_security_ops *ops;
-       struct loadparm_context *lp_ctx;
        void *private_data;
        struct cli_credentials *credentials;
        struct gensec_target target;
        enum gensec_role gensec_role;
        bool subcontext;
        uint32_t want_features;
-       struct event_context *event_ctx;
-       struct messaging_context *msg_ctx; /* only valid as server */
-       struct socket_address *my_addr, *peer_addr;
+       struct tevent_context *event_ctx;
+       struct tsocket_address *local_addr, *remote_addr;
+       struct gensec_settings *settings;
+       
+       /* When we are a server, this may be filled in to provide an
+        * NTLM authentication backend, and user lookup (such as if no
+        * PAC is found) */
+       struct auth_context *auth_context;
 };
 
 /* this structure is used by backends to determine the size of some critical types */
@@ -174,11 +189,12 @@ struct gensec_critical_sizes {
 
 struct gensec_security;
 struct socket_context;
+struct auth_context;
 
 NTSTATUS gensec_socket_init(struct gensec_security *gensec_security,
                            TALLOC_CTX *mem_ctx, 
                            struct socket_context *current_socket,
-                           struct event_context *ev,
+                           struct tevent_context *ev,
                            void (*recv_handler)(void *, uint16_t),
                            void *recv_private,
                            struct socket_context **new_socket);
@@ -209,8 +225,8 @@ NTSTATUS gensec_subcontext_start(TALLOC_CTX *mem_ctx,
                                 struct gensec_security **gensec_security);
 NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx, 
                             struct gensec_security **gensec_security,
-                            struct event_context *ev,
-                            struct loadparm_context *lp_ctx);
+                            struct tevent_context *ev,
+                            struct gensec_settings *settings);
 NTSTATUS gensec_start_mech_by_sasl_list(struct gensec_security *gensec_security, 
                                                 const char **sasl_names);
 NTSTATUS gensec_update(struct gensec_security *gensec_security, TALLOC_CTX *out_mem_ctx, 
@@ -232,9 +248,8 @@ NTSTATUS gensec_session_key(struct gensec_security *gensec_security,
                            DATA_BLOB *session_key);
 NTSTATUS gensec_start_mech_by_oid(struct gensec_security *gensec_security, 
                                  const char *mech_oid);
-const char *gensec_get_name_by_oid(const char *oid_string);
+const char *gensec_get_name_by_oid(struct gensec_security *gensec_security, const char *oid_string);
 struct cli_credentials *gensec_get_credentials(struct gensec_security *gensec_security);
-struct socket_address *gensec_get_peer_addr(struct gensec_security *gensec_security);
 NTSTATUS gensec_init(struct loadparm_context *lp_ctx);
 NTSTATUS gensec_unseal_packet(struct gensec_security *gensec_security, 
                              TALLOC_CTX *mem_ctx, 
@@ -259,21 +274,27 @@ NTSTATUS gensec_sign_packet(struct gensec_security *gensec_security,
                            DATA_BLOB *sig);
 NTSTATUS gensec_start_mech_by_authtype(struct gensec_security *gensec_security, 
                                       uint8_t auth_type, uint8_t auth_level);
-const char *gensec_get_name_by_authtype(uint8_t authtype);
+const char *gensec_get_name_by_authtype(struct gensec_security *gensec_security, uint8_t authtype);
 NTSTATUS gensec_server_start(TALLOC_CTX *mem_ctx, 
-                            struct event_context *ev,
-                            struct loadparm_context *lp_ctx,
-                            struct messaging_context *msg,
+                            struct tevent_context *ev,
+                            struct gensec_settings *settings,
+                            struct auth_context *auth_context,
                             struct gensec_security **gensec_security);
 NTSTATUS gensec_session_info(struct gensec_security *gensec_security, 
                             struct auth_session_info **session_info);
 NTSTATUS auth_nt_status_squash(NTSTATUS nt_status);
-struct creds_CredentialState;
+struct netlogon_creds_CredentialState;
 NTSTATUS dcerpc_schannel_creds(struct gensec_security *gensec_security,
                               TALLOC_CTX *mem_ctx,
-                              struct creds_CredentialState **creds);
-NTSTATUS gensec_set_peer_addr(struct gensec_security *gensec_security, struct socket_address *peer_addr);
-NTSTATUS gensec_set_my_addr(struct gensec_security *gensec_security, struct socket_address *my_addr);
+                              struct netlogon_creds_CredentialState **creds);
+
+
+NTSTATUS gensec_set_local_address(struct gensec_security *gensec_security,
+               const struct tsocket_address *local);
+NTSTATUS gensec_set_remote_address(struct gensec_security *gensec_security,
+               const struct tsocket_address *remote);
+const struct tsocket_address *gensec_get_local_address(struct gensec_security *gensec_security);
+const struct tsocket_address *gensec_get_remote_address(struct gensec_security *gensec_security);
 
 NTSTATUS gensec_start_mech_by_name(struct gensec_security *gensec_security, 
                                        const char *name);
@@ -288,6 +309,7 @@ NTSTATUS gensec_wrap(struct gensec_security *gensec_security,
                     DATA_BLOB *out);
 
 struct gensec_security_ops **gensec_security_all(void);
+bool gensec_security_ops_enabled(struct gensec_security_ops *ops, struct gensec_security *security);
 struct gensec_security_ops **gensec_use_kerberos_mechs(TALLOC_CTX *mem_ctx, 
                                                       struct gensec_security_ops **old_gensec_list, 
                                                       struct cli_credentials *creds);
@@ -295,5 +317,7 @@ struct gensec_security_ops **gensec_use_kerberos_mechs(TALLOC_CTX *mem_ctx,
 NTSTATUS gensec_start_mech_by_sasl_name(struct gensec_security *gensec_security, 
                                        const char *sasl_name);
 
+int gensec_setting_int(struct gensec_settings *settings, const char *mechanism, const char *name, int default_value);
+bool gensec_setting_bool(struct gensec_settings *settings, const char *mechanism, const char *name, bool default_value);
 
 #endif /* __GENSEC_H__ */