From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 May 2010 10:47:59 +0000 (+1000)
Subject: s3:auth Enable make_auth_context_subsystem to be replaced in s3compat
X-Git-Url: http://git.samba.org/?p=abartlet%2Fsamba.git%2F.git;a=commitdiff_plain;h=874ce3d95f8199fe7a386950849d0e6413fb2779

s3:auth Enable make_auth_context_subsystem to be replaced in s3compat

This allows s3compat to replace this with a function that only directs
authentication to the source4 auth subsystem.

Andrew Bartlett
---

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index ad857511af2..9276758b1f6 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -415,7 +415,7 @@ bool load_auth_module(struct auth_context *auth_context,
  Make a auth_info struct for the auth subsystem
 ***************************************************************************/
 
-static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context, char **text_list) 
+NTSTATUS make_auth_context_text_list(struct auth_context **auth_context, char **text_list)
 {
 	auth_methods *list = NULL;
 	auth_methods *t = NULL;
@@ -440,6 +440,7 @@ static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context,
 	return nt_status;
 }
 
+#ifndef ENABLE_S3COMPAT
 /***************************************************************************
  Make a auth_context struct for the auth subsystem
 ***************************************************************************/
@@ -521,6 +522,7 @@ NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context)
 	TALLOC_FREE(auth_method_list);
 	return nt_status;
 }
+#endif
 
 /***************************************************************************
  Make a auth_info struct with a fixed challenge
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9b3c24d53e2..688df59b045 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -31,6 +31,7 @@ bool load_auth_module(struct auth_context *auth_context,
 		      const char *module, auth_methods **ret) ;
 NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context) ;
 NTSTATUS make_auth_context_fixed(struct auth_context **auth_context, uchar chal[8]) ;
+NTSTATUS make_auth_context_text_list(struct auth_context **auth_context, char **text_list);
 
 /* The following definitions come from auth/auth_builtin.c  */