I've decided to move the auth code around a bit more...

The auth_authsupplied_info typedef is now just a plain struct - auth_context,
but it has been modified to contain the function pointers to the rest
of the auth subsystem's components.

(Who needs non-static functions anyway?)

In working all this mess out, I fixed a number of memory leaks and moved the
entire auth subsystem over to talloc().

Note that the TALLOC_CTX attached to the auth_context can be rather long-lived,
it is provided for things that are intended to live as long.  (The
global_negprot_auth_context lasts the whole life of the smbd).

I've also adjusted a few things in auth_domain.c, mainly passing the domain as
a paramater to a few functions instead of looking up lp_workgroup().  I'm
hopign to make this entire thing a bit more trusted domains (as PDC) freindly
in the near future.

Other than that, I moved a bit of the code around, hence the rather messy diff.

Andrew Bartlett
(This used to be commit 12f5515f556cf39fea98134fe3e2ac4540501048)

1 files changed, 8 insertions, 11 deletions

diff --git a/source3/auth/auth_builtin.c b/source3/auth/auth_builtin.c
index f76987f685..f1c89689fa 100644
--- a/source3/auth/auth_builtin.c
+++ b/source3/auth/auth_builtin.c
@@ -29,10 +29,10 @@
  * and pass onto the next module.
  **/
 
-static NTSTATUS check_guest_security(void *my_private_data, 
+static NTSTATUS check_guest_security(const struct auth_context *auth_context,
+				     void *my_private_data, 
 				     TALLOC_CTX *mem_ctx,
 				     const auth_usersupplied_info *user_info, 
-				     const auth_authsupplied_info *auth_info,
 				     auth_serversupplied_info **server_info)
 {
 	NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
@@ -50,9 +50,9 @@ static NTSTATUS check_guest_security(void *my_private_data,
 }
 
 /* Guest modules initialisation */
-BOOL auth_init_guest(auth_methods **auth_method) 
+BOOL auth_init_guest(struct auth_context *auth_context, auth_methods **auth_method) 
 {
-	if (!make_auth_methods(auth_method)) {
+	if (!make_auth_methods(auth_context, auth_method)) {
 		return False;
 	}
 
@@ -73,10 +73,10 @@ BOOL auth_init_guest(auth_methods **auth_method)
  * @return An NTSTATUS value based on the username
  **/
 
-static NTSTATUS check_name_to_ntstatus_security(void *my_private_data,
+static NTSTATUS check_name_to_ntstatus_security(const struct auth_context *auth_context,
+						void *my_private_data, 
 						TALLOC_CTX *mem_ctx,
 						const auth_usersupplied_info *user_info, 
-						const auth_authsupplied_info *auth_info,
 						auth_serversupplied_info **server_info)
 {
 	NTSTATUS nt_status;
@@ -100,9 +100,9 @@ static NTSTATUS check_name_to_ntstatus_security(void *my_private_data,
 }
 
 /** Module initailisation function */
-BOOL auth_init_name_to_ntstatus(auth_methods **auth_method) 
+BOOL auth_init_name_to_ntstatus(struct auth_context *auth_context, auth_methods **auth_method) 
 {
-	if (!make_auth_methods(auth_method)) {
+	if (!make_auth_methods(auth_context, auth_method)) {
 		return False;
 	}
 
@@ -110,6 +110,3 @@ BOOL auth_init_name_to_ntstatus(auth_methods **auth_method)
 	return True;
 }
 
-
-
-