A farily large commit:

 - Move rpc_client/cli_trust.c to smbd/change_trust_pw.c
  - It hasn't been used by anything else since smbpasswd lost its -j

 - Add a TALLOC_CTX to the auth subsytem.  These are only valid for the length
   of the calls to the individual modules, if you want a longer context hide it
   in your private data.

   Similarly, all returns (like the server_info) should still be malloced.

 - Move the 'ntdomain' module (security=domain in oldspeak) over to use the new
   libsmb domain logon code.  Also rework much of the code to use some better
   helper functions for the connection - getting us much better error returns
   (the new code is NTSTATUS).

   The only remaining thing to do is to figure out if tpot's 0xdead 0xbeef for
   the LUID feilds is sufficient, or if we should do random LUIDs as per the old
   code.

   Similarly, I'll move winbind over to this when I get a chance.

This leaves the SPOOLSS code and some cli_pipe code as the only stuff still in
rpc_client, at least as far as smbd is concerned.

While I've given this a basic rundown, any testing is as always appriciated.

Andrew Bartlett

1 files changed, 5 insertions, 2 deletions

diff --git a/source/include/auth.h b/source/include/auth.h
index 270b8d388ab..b823e7bf4be 100644
--- a/source/include/auth.h
+++ b/source/include/auth.h
@@ -95,7 +95,7 @@ typedef struct authsupplied_info {
 	DATA_BLOB challenge; 
 
 	/* Who set this up in the first place? */ 
-	char *challenge_set_by; \
+	char *challenge_set_by; 
 
 	struct auth_methods *challenge_set_method; 
 	/* What order are the various methods in?   Try to stop it changing under us */ 
@@ -108,11 +108,14 @@ typedef struct auth_methods
 	char *name; /* What name got this module */
 
 	NTSTATUS (*auth)(void *my_private_data, 
+			 TALLOC_CTX *mem_ctx,
 			 const auth_usersupplied_info *user_info, 
 			 const struct authsupplied_info *auth_info,
 			 auth_serversupplied_info **server_info);
 
-	DATA_BLOB (*get_chal)(void **my_private_data, const struct authsupplied_info *auth_info);
+	DATA_BLOB (*get_chal)(void **my_private_data, 
+			      TALLOC_CTX *mem_ctx, 
+			      const struct authsupplied_info *auth_info);
 	
 	/* Used to keep tabs on things like the cli for SMB server authentication */
 	void *private_data;