From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 14 Dec 2009 08:43:59 +0000 (+1100)
Subject: s3:auth Make get_ntlm_challenge more like Samba4
X-Git-Tag: samba-3.6.0pre1~2060
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=468fb4fee49aa0cd1919fcd3803d2490e2ac568d;p=thirdparty%2Fsamba.git

s3:auth Make get_ntlm_challenge more like Samba4

This helps with the upcoming NTLMSSP merge, and allows errors to be returned.

Andrew Bartlett
---

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 317fe307d4b..b4995ce19b5 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -76,7 +76,7 @@ static struct auth_init_function_entry *auth_find_backend_entry(const char *name
  Returns a const char of length 8 bytes.
 ****************************************************************************/
 
-static void get_ntlm_challenge(struct auth_context *auth_context,
+static NTSTATUS get_ntlm_challenge(struct auth_context *auth_context,
 			       uint8_t chal[8])
 {
 	DATA_BLOB challenge = data_blob_null;
@@ -87,7 +87,7 @@ static void get_ntlm_challenge(struct auth_context *auth_context,
 		DEBUG(5, ("get_ntlm_challenge (auth subsystem): returning previous challenge by module %s (normal)\n", 
 			  auth_context->challenge_set_by));
 		memcpy(chal, auth_context->challenge.data, 8);
-		return;
+		return NT_STATUS_OK;
 	}
 
 	auth_context->challenge_may_be_modified = False;
@@ -138,6 +138,7 @@ static void get_ntlm_challenge(struct auth_context *auth_context,
 	auth_context->challenge_set_by=challenge_set_by;
 
 	memcpy(chal, auth_context->challenge.data, 8);
+	return NT_STATUS_OK;
 }
 
 
diff --git a/source3/include/auth.h b/source3/include/auth.h
index efae56ae52e..09ad6319365 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -91,8 +91,8 @@ struct auth_context {
 	/* What order are the various methods in?   Try to stop it changing under us */ 
 	struct auth_methods *auth_method_list;	
 
-	void (*get_ntlm_challenge)(struct auth_context *auth_context,
-				   uint8_t chal[8]);
+	NTSTATUS (*get_ntlm_challenge)(struct auth_context *auth_context,
+				       uint8_t chal[8]);
 	NTSTATUS (*check_ntlm_password)(const struct auth_context *auth_context,
 					const struct auth_usersupplied_info *user_info, 
 					struct auth_serversupplied_info **server_info);