auth: Make check_password and generate_session_info hook generic

gensec_ntlmssp does not need to know the internal form of the
struct user_info_dc or auth_serversupplied_info.  This will allow the
calling logic to be put in common.

Andrew Bartlett

2 files changed, 4 insertions, 6 deletions

diff --git a/auth/common_auth.h b/auth/common_auth.h
index 3991c409ac..453c0c9efb 100644
--- a/auth/common_auth.h
+++ b/auth/common_auth.h
@@ -108,7 +108,8 @@ struct auth4_context {
 	NTSTATUS (*check_password)(struct auth4_context *auth_ctx,
 				   TALLOC_CTX *mem_ctx,
 				   const struct auth_usersupplied_info *user_info,
-				   struct auth_user_info_dc **user_info_dc);
+				   void **server_returned_info,
+				   DATA_BLOB *nt_session_key, DATA_BLOB *lm_session_key);
 
 	NTSTATUS (*get_challenge)(struct auth4_context *auth_ctx, uint8_t chal[8]);
 
@@ -118,7 +119,7 @@ struct auth4_context {
 
 	NTSTATUS (*generate_session_info)(TALLOC_CTX *mem_ctx,
 					  struct auth4_context *auth_context,
-					  struct auth_user_info_dc *user_info_dc,
+					  void *server_returned_info,
 					  uint32_t session_info_flags,
 					  struct auth_session_info **session_info);
 
diff --git a/auth/ntlmssp/ntlmssp.h b/auth/ntlmssp/ntlmssp.h
index 9801b14ea3..54d3e53526 100644
--- a/auth/ntlmssp/ntlmssp.h
+++ b/auth/ntlmssp/ntlmssp.h
@@ -34,13 +34,10 @@ struct ntlmssp_state;
 struct gensec_ntlmssp_context {
 	/* used only by s3 server implementation */
 	struct auth_context *auth_context;
-	struct auth_serversupplied_info *server_info;
-
-	/* Used by the s4 server implementation */
-	struct auth_user_info_dc *user_info_dc;
 
 	/* For GENSEC users */
 	struct gensec_security *gensec_security;
+	void *server_returned_info;
 
 	/* used by both client and server implementation */
 	struct ntlmssp_state *ntlmssp_state;