s3-auth Add const to make_user_info_map

[tridge/samba.git] / source3 / auth / proto.h

diff --git a/source3/auth/proto.h b/source3/auth/proto.h
index 8ff9fa9b995ecac0dd8feffceceb91da62c3c372..82d6018556c5205da4ee4b5247be59f3f96172e8 100644 (file)
--- a/source3/auth/proto.h
+++ b/source3/auth/proto.h
@@ -69,12 +69,8 @@ NTSTATUS auth_netlogond_init(void);
 
 /* The following definitions come from auth/auth_ntlmssp.c  */
 
-NTSTATUS auth_ntlmssp_steal_session_info(TALLOC_CTX *mem_ctx,
-                               struct auth_ntlmssp_state *auth_ntlmssp_state,
-                               struct auth_serversupplied_info **session_info);
-NTSTATUS auth_ntlmssp_start(const struct tsocket_address *remote_address,
-                           struct auth_ntlmssp_state **auth_ntlmssp_state);
-
+NTSTATUS auth_generic_prepare(TALLOC_CTX *mem_ctx, const struct tsocket_address *remote_address,
+                             struct gensec_security **gensec_security_out);
 
 /* The following definitions come from auth/auth_sam.c  */
 
@@ -104,8 +100,8 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
                            const char *client_domain,
                            const char *workstation_name,
                            const struct tsocket_address *remote_address,
-                           DATA_BLOB *lm_pwd,
-                           DATA_BLOB *nt_pwd,
+                           const DATA_BLOB *lm_pwd,
+                           const DATA_BLOB *nt_pwd,
                            const struct samr_Password *lm_interactive_pwd,
                            const struct samr_Password *nt_interactive_pwd,
                            const char *plaintext,
@@ -150,7 +146,8 @@ NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info,
 NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
                            const struct auth_serversupplied_info *server_info,
                            DATA_BLOB *session_key,
-                           struct auth_serversupplied_info **session_info_out);
+                           const char *smb_name,
+                           struct auth_session_info **session_info_out);
 NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
                                    bool is_guest,
                                    uid_t *uid, gid_t *gid,
@@ -165,18 +162,20 @@ NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
 NTSTATUS make_session_info_from_username(TALLOC_CTX *mem_ctx,
                                         const char *username,
                                         bool is_guest,
-                                        struct auth_serversupplied_info **session_info);
-struct auth_serversupplied_info *copy_serverinfo(TALLOC_CTX *mem_ctx,
-                                                const struct auth_serversupplied_info *src);
+                                        struct auth_session_info **session_info);
+struct auth_session_info *copy_session_info(TALLOC_CTX *mem_ctx,
+                                            const struct auth_session_info *src);
 bool init_guest_info(void);
 NTSTATUS init_system_info(void);
-bool session_info_set_session_key(struct auth_serversupplied_info *info,
+bool session_info_set_session_key(struct auth_session_info *info,
                                 DATA_BLOB session_key);
 NTSTATUS make_server_info_guest(TALLOC_CTX *mem_ctx,
                                struct auth_serversupplied_info **server_info);
+NTSTATUS make_session_info_guest(TALLOC_CTX *mem_ctx,
+                               struct auth_session_info **server_info);
 NTSTATUS make_session_info_system(TALLOC_CTX *mem_ctx,
-                                struct auth_serversupplied_info **session_info);
-const struct auth_serversupplied_info *get_session_info_system(void);
+                                struct auth_session_info **session_info);
+const struct auth_session_info *get_session_info_system(void);
 bool copy_current_user(struct current_user *dst, struct current_user *src);
 struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
                             char **p_save_username, bool create );
@@ -192,7 +191,6 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
                                          const struct wbcAuthUserInfo *info,
                                          struct auth_serversupplied_info **server_info);
 void free_user_info(struct auth_usersupplied_info **user_info);
-bool make_auth_methods(struct auth_context *auth_context, auth_methods **auth_method) ;
 bool is_trusted_domain(const char* dom_name);
 
 /* The following definitions come from auth/user_info.c  */
@@ -212,6 +210,10 @@ NTSTATUS make_user_info(struct auth_usersupplied_info **ret_user_info,
                        enum auth_password_state password_state);
 void free_user_info(struct auth_usersupplied_info **user_info);
 
+NTSTATUS do_map_to_guest_server_info(NTSTATUS status,
+                                    struct auth_serversupplied_info **server_info,
+                                    const char *user, const char *domain);
+
 /* The following definitions come from auth/auth_winbind.c  */
 
 NTSTATUS auth_winbind_init(void);
@@ -316,6 +318,6 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx,
                                struct PAC_LOGON_INFO *logon_info,
                                bool mapped_to_guest, bool username_was_mapped,
                                DATA_BLOB *session_key,
-                               struct auth_serversupplied_info **session_info);
+                               struct auth_session_info **session_info);
 
 #endif /* _AUTH_PROTO_H_ */