r26445: Fix credentials python bindings.
[ira/wip.git] / source / auth / auth.c
index 60807deac4cb80fc68627939b16fd7050f87c2e0..918890b3f621d3e372f3fdb8e85ebeea8f1a649f 100644 (file)
@@ -2,10 +2,11 @@
    Unix SMB/CIFS implementation.
    Password and authentication handling
    Copyright (C) Andrew Bartlett         2001-2002
+   Copyright (C) Stefan Metzmacher       2005
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "lib/util/dlinklist.h"
+#include "auth/auth.h"
+#include "lib/events/events.h"
+#include "build.h"
+#include "param/param.h"
 
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_AUTH
+/***************************************************************************
+ Set a fixed challenge
+***************************************************************************/
+NTSTATUS auth_context_set_challenge(struct auth_context *auth_ctx, const uint8_t chal[8], const char *set_by) 
+{
+       auth_ctx->challenge.set_by = talloc_strdup(auth_ctx, set_by);
+       NT_STATUS_HAVE_NO_MEMORY(auth_ctx->challenge.set_by);
+
+       auth_ctx->challenge.data = data_blob_talloc(auth_ctx, chal, 8);
+       NT_STATUS_HAVE_NO_MEMORY(auth_ctx->challenge.data.data);
+
+       return NT_STATUS_OK;
+}
+
+/***************************************************************************
+ Set a fixed challenge
+***************************************************************************/
+bool auth_challenge_may_be_modified(struct auth_context *auth_ctx) 
+{
+       return auth_ctx->challenge.may_be_modified;
+}
 
 /****************************************************************************
  Try to get a challenge out of the various authentication modules.
  Returns a const char of length 8 bytes.
 ****************************************************************************/
-
-static const uint8_t *get_ntlm_challenge(struct auth_context *auth_context) 
+_PUBLIC_ NTSTATUS auth_get_challenge(struct auth_context *auth_ctx, const uint8_t **_chal)
 {
-       DATA_BLOB challenge = data_blob(NULL, 0);
-       const char *challenge_set_by = NULL;
-       struct auth_methods *auth_method;
-       TALLOC_CTX *mem_ctx;
-
-       if (auth_context->challenge.length) {
-               DEBUG(5, ("get_ntlm_challenge (auth subsystem): returning previous challenge by module %s (normal)\n", 
-                         auth_context->challenge_set_by));
-               return auth_context->challenge.data;
+       NTSTATUS nt_status;
+       struct auth_method_context *method;
+
+       if (auth_ctx->challenge.data.length) {
+               DEBUG(5, ("auth_get_challenge: returning previous challenge by module %s (normal)\n", 
+                         auth_ctx->challenge.set_by));
+               *_chal = auth_ctx->challenge.data.data;
+               return NT_STATUS_OK;
        }
 
-       auth_context->challenge_may_be_modified = False;
+       for (method = auth_ctx->methods; method; method = method->next) {
+               DATA_BLOB challenge = data_blob(NULL,0);
 
-       for (auth_method = auth_context->auth_method_list; auth_method; auth_method = auth_method->next) {
-               if (auth_method->get_chal == NULL) {
-                       DEBUG(5, ("auth_get_challenge: module %s did not want to specify a challenge\n", auth_method->name));
+               nt_status = method->ops->get_challenge(method, auth_ctx, &challenge);
+               if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NOT_IMPLEMENTED)) {
                        continue;
                }
 
-               DEBUG(5, ("auth_get_challenge: getting challenge from module %s\n", auth_method->name));
-               if (challenge_set_by != NULL) {
-                       DEBUG(1, ("auth_get_challenge: CONFIGURATION ERROR: authentication method %s has already specified a challenge.  Challenge by %s ignored.\n", 
-                                 challenge_set_by, auth_method->name));
-                       continue;
-               }
+               NT_STATUS_NOT_OK_RETURN(nt_status);
 
-               mem_ctx = talloc_init("auth_get_challenge for module %s", auth_method->name);
-               if (!mem_ctx) {
-                       smb_panic("talloc_init() failed!");
-               }
-               
-               challenge = auth_method->get_chal(auth_context, &auth_method->private_data, mem_ctx);
-               if (!challenge.length) {
-                       DEBUG(3, ("auth_get_challenge: getting challenge from authentication method %s FAILED.\n", 
-                                 auth_method->name));
-               } else {
-                       DEBUG(5, ("auth_get_challenge: sucessfully got challenge from module %s\n", auth_method->name));
-                       auth_context->challenge = challenge;
-                       challenge_set_by = auth_method->name;
-                       auth_context->challenge_set_method = auth_method;
+               if (challenge.length != 8) {
+                       DEBUG(0, ("auth_get_challenge: invalid challenge (length %u) by mothod [%s]\n",
+                               (unsigned)challenge.length, method->ops->name));
+                       return NT_STATUS_INTERNAL_ERROR;
                }
-               talloc_destroy(mem_ctx);
+
+               auth_ctx->challenge.data        = challenge;
+               auth_ctx->challenge.set_by      = method->ops->name;
+
+               break;
        }
-       
-       if (!challenge_set_by) {
+
+       if (!auth_ctx->challenge.set_by) {
                uint8_t chal[8];
-               
-               generate_random_buffer(chal, sizeof(chal), False);
-               auth_context->challenge = data_blob_talloc(auth_context->mem_ctx, 
-                                                          chal, sizeof(chal));
-               
-               challenge_set_by = "random";
-               auth_context->challenge_may_be_modified = True;
-       } 
-       
-       DEBUG(5, ("auth_context challenge created by %s\n", challenge_set_by));
-       DEBUG(5, ("challenge is: \n"));
-       dump_data(5, (const char *)auth_context->challenge.data, auth_context->challenge.length);
-       
-       SMB_ASSERT(auth_context->challenge.length == 8);
+               generate_random_buffer(chal, 8);
 
-       auth_context->challenge_set_by=challenge_set_by;
+               auth_ctx->challenge.data                = data_blob_talloc(auth_ctx, chal, 8);
+               NT_STATUS_HAVE_NO_MEMORY(auth_ctx->challenge.data.data);
+               auth_ctx->challenge.set_by              = "random";
 
-       return auth_context->challenge.data;
-}
+               auth_ctx->challenge.may_be_modified     = true;
+       }
 
+       DEBUG(10,("auth_get_challenge: challenge set by %s\n",
+                auth_ctx->challenge.set_by));
 
-/**
- * Check user is in correct domain (if required)
- *
- * @param user Only used to fill in the debug message
- * 
- * @param domain The domain to be verified
- *
- * @return True if the user can connect with that domain, 
- *         False otherwise.
-**/
+       *_chal = auth_ctx->challenge.data.data;
+       return NT_STATUS_OK;
+}
+
+struct auth_check_password_sync_state {
+       bool finished;
+       NTSTATUS status;
+       struct auth_serversupplied_info *server_info;
+};
 
-static BOOL check_domain_match(const char *user, const char *domain) 
+static void auth_check_password_sync_callback(struct auth_check_password_request *req,
+                                             void *private_data)
 {
-       /*
-        * If we aren't serving to trusted domains, we must make sure that
-        * the validation request comes from an account in the same domain
-        * as the Samba server
-        */
-
-       if (!lp_allow_trusted_domains() &&
-           !(strequal("", domain) || 
-             strequal(lp_workgroup(), domain) || 
-             is_myname(domain))) {
-               DEBUG(1, ("check_domain_match: Attempt to connect as user %s from domain %s denied.\n", user, domain));
-               return False;
-       } else {
-               return True;
-       }
+       struct auth_check_password_sync_state *s = talloc_get_type(private_data,
+                                                  struct auth_check_password_sync_state);
+
+       s->finished = true;
+       s->status = auth_check_password_recv(req, s, &s->server_info);
 }
 
 /**
  * Check a user's Plaintext, LM or NTLM password.
+ * (sync version)
  *
  * Check a user's password, as given in the user_info struct and return various
  * interesting details in the server_info struct.
@@ -137,14 +130,15 @@ static BOOL check_domain_match(const char *user, const char *domain)
  * struct.  When the return is other than NT_STATUS_OK the contents 
  * of that structure is undefined.
  *
- * @param user_info Contains the user supplied components, including the passwords.
- *                  Must be created with make_user_info() or one of its wrappers.
- *
- * @param auth_context Supplies the challenges and some other data. 
- *                  Must be created with make_auth_context(), and the challenges should be 
+ * @param auth_ctx Supplies the challenges and some other data. 
+ *                  Must be created with auth_context_create(), and the challenges should be 
  *                  filled in, either at creation or by calling the challenge geneation 
  *                  function auth_get_challenge().  
  *
+ * @param user_info Contains the user supplied components, including the passwords.
+ *
+ * @param mem_ctx The parent memory context for the server_info structure
+ *
  * @param server_info If successful, contains information about the authentication, 
  *                    including a SAM_ACCOUNT struct describing the user.
  *
@@ -152,253 +146,297 @@ static BOOL check_domain_match(const char *user, const char *domain)
  *
  **/
 
-static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
-                                   const struct auth_usersupplied_info *user_info, 
-                                   struct auth_serversupplied_info **server_info)
+NTSTATUS auth_check_password(struct auth_context *auth_ctx,
+                            TALLOC_CTX *mem_ctx,
+                            const struct auth_usersupplied_info *user_info, 
+                            struct auth_serversupplied_info **server_info)
 {
-       /* if all the modules say 'not for me' this is reasonable */
-       NTSTATUS nt_status = NT_STATUS_NO_SUCH_USER;
-       struct auth_methods *auth_method;
-       TALLOC_CTX *mem_ctx;
+       struct auth_check_password_sync_state *sync_state;
+       NTSTATUS status;
 
-       if (!user_info || !auth_context || !server_info)
-               return NT_STATUS_LOGON_FAILURE;
+       sync_state = talloc_zero(auth_ctx, struct auth_check_password_sync_state);
+       NT_STATUS_HAVE_NO_MEMORY(sync_state);
 
-       DEBUG(3, ("check_ntlm_password:  Checking password for unmapped user [%s]\\[%s]@[%s] with the new password interface\n", 
-                 user_info->client_domain.str, user_info->smb_name.str, user_info->wksta_name.str));
+       auth_check_password_send(auth_ctx, user_info, auth_check_password_sync_callback, sync_state);
 
-       DEBUG(3, ("check_ntlm_password:  mapped user is: [%s]\\[%s]@[%s]\n", 
-                 user_info->domain.str, user_info->internal_username.str, user_info->wksta_name.str));
+       while (!sync_state->finished) {
+               event_loop_once(auth_ctx->event_ctx);
+       }
+
+       status = sync_state->status;
 
-       if (auth_context->challenge.length == 0) {
-               /* get a challenge, if we have not asked for one yet */
-               get_ntlm_challenge(auth_context);
+       if (NT_STATUS_IS_OK(status)) {
+               *server_info = talloc_steal(mem_ctx, sync_state->server_info);
        }
 
-       if (auth_context->challenge.length != 8) {
-               DEBUG(0, ("check_ntlm_password:  Invalid challenge stored for this auth context - cannot continue\n"));
-               return NT_STATUS_LOGON_FAILURE;
+       talloc_free(sync_state);
+       return status;
+}
+
+struct auth_check_password_request {
+       struct auth_context *auth_ctx;
+       const struct auth_usersupplied_info *user_info;
+       struct auth_serversupplied_info *server_info;
+       struct auth_method_context *method;
+       NTSTATUS status;
+       struct {
+               void (*fn)(struct auth_check_password_request *req, void *private_data);
+               void *private_data;
+       } callback;
+};
+
+static void auth_check_password_async_timed_handler(struct event_context *ev, struct timed_event *te,
+                                                   struct timeval t, void *ptr)
+{
+       struct auth_check_password_request *req = talloc_get_type(ptr, struct auth_check_password_request);
+       req->status = req->method->ops->check_password(req->method, req, req->user_info, &req->server_info);
+       req->callback.fn(req, req->callback.private_data);
+}
+
+/**
+ * Check a user's Plaintext, LM or NTLM password.
+ * async send hook
+ *
+ * Check a user's password, as given in the user_info struct and return various
+ * interesting details in the server_info struct.
+ *
+ * The return value takes precedence over the contents of the server_info 
+ * struct.  When the return is other than NT_STATUS_OK the contents 
+ * of that structure is undefined.
+ *
+ * @param auth_ctx Supplies the challenges and some other data. 
+ *                  Must be created with make_auth_context(), and the challenges should be 
+ *                  filled in, either at creation or by calling the challenge geneation 
+ *                  function auth_get_challenge().  
+ *
+ * @param user_info Contains the user supplied components, including the passwords.
+ *
+ * @param callback A callback function which will be called when the operation is finished.
+ *                 The callback function needs to call auth_check_password_recv() to get the return values
+ *
+ * @param private_data A private pointer which will ba passed to the callback function
+ *
+ **/
+
+void auth_check_password_send(struct auth_context *auth_ctx,
+                             const struct auth_usersupplied_info *user_info,
+                             void (*callback)(struct auth_check_password_request *req, void *private_data),
+                             void *private_data)
+{
+       /* if all the modules say 'not for me' this is reasonable */
+       NTSTATUS nt_status;
+       struct auth_method_context *method;
+       const uint8_t *challenge;
+       struct auth_usersupplied_info *user_info_tmp;
+       struct auth_check_password_request *req = NULL;
+
+       DEBUG(3,   ("auth_check_password_send:  Checking password for unmapped user [%s]\\[%s]@[%s]\n", 
+                   user_info->client.domain_name, user_info->client.account_name, user_info->workstation_name));
+
+       req = talloc_zero(auth_ctx, struct auth_check_password_request);
+       if (!req) {
+               callback(NULL, private_data);
+               return;
+       }
+       req->auth_ctx                   = auth_ctx;
+       req->user_info                  = user_info;
+       req->callback.fn                = callback;
+       req->callback.private_data      = private_data;
+
+       if (!user_info->mapped_state) {
+               nt_status = map_user_info(req, lp_workgroup(auth_ctx->lp_ctx), user_info, &user_info_tmp);
+               if (!NT_STATUS_IS_OK(nt_status)) goto failed;
+               user_info = user_info_tmp;
+               req->user_info  = user_info_tmp;
        }
 
-       if (auth_context->challenge_set_by)
-               DEBUG(10, ("check_ntlm_password: auth_context challenge created by %s\n",
-                                       auth_context->challenge_set_by));
+       DEBUGADD(3,("auth_check_password_send:  mapped user is: [%s]\\[%s]@[%s]\n", 
+                   user_info->mapped.domain_name, user_info->mapped.account_name, user_info->workstation_name));
 
-       DEBUG(10, ("challenge is: \n"));
-       dump_data(5, (const char *)auth_context->challenge.data, auth_context->challenge.length);
+       nt_status = auth_get_challenge(auth_ctx, &challenge);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               DEBUG(0, ("auth_check_password_send:  Invalid challenge (length %u) stored for this auth context set_by %s - cannot continue: %s\n",
+                       (unsigned)auth_ctx->challenge.data.length, auth_ctx->challenge.set_by, nt_errstr(nt_status)));
+               goto failed;
+       }
 
-#ifdef DEBUG_PASSWORD
-       DEBUG(100, ("user_info has passwords of length %d and %d\n", 
-                   user_info->lm_resp.length, user_info->nt_resp.length));
-       DEBUG(100, ("lm:\n"));
-       dump_data(100, user_info->lm_resp.data, user_info->lm_resp.length);
-       DEBUG(100, ("nt:\n"));
-       dump_data(100, user_info->nt_resp.data, user_info->nt_resp.length);
-#endif
+       if (auth_ctx->challenge.set_by) {
+               DEBUG(10, ("auth_check_password_send: auth_context challenge created by %s\n",
+                                       auth_ctx->challenge.set_by));
+       }
 
-       /* This needs to be sorted:  If it doesn't match, what should we do? */
-       if (!check_domain_match(user_info->smb_name.str, user_info->domain.str))
-               return NT_STATUS_LOGON_FAILURE;
+       DEBUG(10, ("auth_check_password_send: challenge is: \n"));
+       dump_data(5, auth_ctx->challenge.data.data, auth_ctx->challenge.data.length);
 
-       for (auth_method = auth_context->auth_method_list;auth_method; auth_method = auth_method->next) {
+       nt_status = NT_STATUS_NO_SUCH_USER; /* If all the modules say 'not for me', then this is reasonable */
+       for (method = auth_ctx->methods; method; method = method->next) {
                NTSTATUS result;
-               
-               mem_ctx = talloc_init("%s authentication for user %s\\%s", auth_method->name, 
-                                           user_info->domain.str, user_info->smb_name.str);
-
-               result = auth_method->auth(auth_context, auth_method->private_data, mem_ctx, user_info, server_info);
+               struct timed_event *te = NULL;
 
-               /* check if the module did anything */
-               if ( NT_STATUS_V(result) == NT_STATUS_V(NT_STATUS_NOT_IMPLEMENTED) ) {
-                       DEBUG(10,("check_ntlm_password: %s had nothing to say\n", auth_method->name));
-                       talloc_destroy(mem_ctx);
+               /* check if the module wants to chek the password */
+               result = method->ops->want_check(method, req, user_info);
+               if (NT_STATUS_EQUAL(result, NT_STATUS_NOT_IMPLEMENTED)) {
+                       DEBUG(11,("auth_check_password_send: %s had nothing to say\n", method->ops->name));
                        continue;
                }
 
                nt_status = result;
+               req->method     = method;
 
-               if (NT_STATUS_IS_OK(nt_status)) {
-                       DEBUG(3, ("check_ntlm_password: %s authentication for user [%s] succeeded\n", 
-                                 auth_method->name, user_info->smb_name.str));
-               } else {
-                       DEBUG(5, ("check_ntlm_password: %s authentication for user [%s] FAILED with error %s\n", 
-                                 auth_method->name, user_info->smb_name.str, nt_errstr(nt_status)));
-               }
-
-               talloc_destroy(mem_ctx);
-
-               if ( NT_STATUS_IS_OK(nt_status))
-               {
-                               break;                  
-               }
-       }
+               if (!NT_STATUS_IS_OK(nt_status)) break;
 
-       if (NT_STATUS_IS_OK(nt_status)) {
-               if (NT_STATUS_IS_OK(nt_status)) {
-                       DEBUG((*server_info)->guest ? 5 : 2, 
-                             ("check_ntlm_password:  %sauthentication for user [%s] -> [%s] succeeded\n", 
-                              (*server_info)->guest ? "guest " : "", 
-                              user_info->smb_name.str, 
-                              user_info->internal_username.str));
+               te = event_add_timed(auth_ctx->event_ctx, req,
+                                    timeval_zero(),
+                                    auth_check_password_async_timed_handler, req);
+               if (!te) {
+                       nt_status = NT_STATUS_NO_MEMORY;
+                       goto failed;
                }
+               return;
        }
 
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               DEBUG(2, ("check_ntlm_password:  Authentication for user [%s] -> [%s] FAILED with error %s\n", 
-                         user_info->smb_name.str, user_info->internal_username.str, 
-                         nt_errstr(nt_status)));
-               ZERO_STRUCTP(server_info);
-       }
-       return nt_status;
+failed:
+       req->status = nt_status;
+       req->callback.fn(req, req->callback.private_data);
 }
 
-/***************************************************************************
- Clear out a auth_context, and destroy the attached TALLOC_CTX
-***************************************************************************/
+/**
+ * Check a user's Plaintext, LM or NTLM password.
+ * async receive function
+ *
+ * The return value takes precedence over the contents of the server_info 
+ * struct.  When the return is other than NT_STATUS_OK the contents 
+ * of that structure is undefined.
+ *
+ *
+ * @param req The async auth_check_password state, passes to the callers callback function
+ *
+ * @param mem_ctx The parent memory context for the server_info structure
+ *
+ * @param server_info If successful, contains information about the authentication, 
+ *                    including a SAM_ACCOUNT struct describing the user.
+ *
+ * @return An NTSTATUS with NT_STATUS_OK or an appropriate error.
+ *
+ **/
 
-void free_auth_context(struct auth_context **auth_context)
+NTSTATUS auth_check_password_recv(struct auth_check_password_request *req,
+                                 TALLOC_CTX *mem_ctx,
+                                 struct auth_serversupplied_info **server_info)
 {
-       struct auth_methods *auth_method;
-       
-       if (*auth_context) {
-               /* Free private data of context's authentication methods */
-               for (auth_method = (*auth_context)->auth_method_list; auth_method; auth_method = auth_method->next) {
-                       if (auth_method->free_private_data) {
-                               auth_method->free_private_data (&auth_method->private_data);
-                               auth_method->private_data = NULL;
-                       }
-               }
-
-               talloc_destroy((*auth_context)->mem_ctx);
-               *auth_context = NULL;
-       }
-}
+       NTSTATUS status;
 
-/***************************************************************************
- Make a auth_info struct
-***************************************************************************/
+       NT_STATUS_HAVE_NO_MEMORY(req);
 
-static NTSTATUS make_auth_context(struct auth_context **auth_context) 
-{
-       TALLOC_CTX *mem_ctx;
+       if (NT_STATUS_IS_OK(req->status)) {
+               DEBUG(5,("auth_check_password_recv: %s authentication for user [%s\\%s] succeeded\n",
+                        req->method->ops->name, req->server_info->domain_name, req->server_info->account_name));
 
-       mem_ctx = talloc_init("authentication context");
-       
-       *auth_context = talloc(mem_ctx, sizeof(**auth_context));
-       if (!*auth_context) {
-               DEBUG(0,("make_auth_context: talloc failed!\n"));
-               talloc_destroy(mem_ctx);
-               return NT_STATUS_NO_MEMORY;
+               *server_info = talloc_steal(mem_ctx, req->server_info);
+       } else {
+               DEBUG(2,("auth_check_password_recv: %s authentication for user [%s\\%s] FAILED with error %s\n", 
+                        (req->method ? req->method->ops->name : "NO_METHOD"),
+                        req->user_info->mapped.domain_name,
+                        req->user_info->mapped.account_name, 
+                        nt_errstr(req->status)));
        }
-       ZERO_STRUCTP(*auth_context);
 
-       (*auth_context)->mem_ctx = mem_ctx;
-       (*auth_context)->check_ntlm_password = check_ntlm_password;
-       (*auth_context)->get_ntlm_challenge = get_ntlm_challenge;
-       
-       return NT_STATUS_OK;
+       status = req->status;
+       talloc_free(req);
+       return status;
 }
 
 /***************************************************************************
  Make a auth_info struct for the auth subsystem
+ - Allow the caller to specify the methods to use
 ***************************************************************************/
-
-static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context, char **text_list) 
+NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **methods, 
+                                    struct event_context *ev,
+                                    struct messaging_context *msg,
+                                    struct loadparm_context *lp_ctx,
+                                    struct auth_context **auth_ctx)
 {
-       struct auth_methods *list = NULL;
-       struct auth_methods *t = NULL;
        int i;
-       NTSTATUS nt_status;
+       struct auth_context *ctx;
 
-       if (!text_list) {
-               DEBUG(2,("make_auth_context_text_list: No auth method list!?\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+       if (!methods) {
+               DEBUG(0,("auth_context_create: No auth method list!?\n"));
+               return NT_STATUS_INTERNAL_ERROR;
        }
-       
-       if (!NT_STATUS_IS_OK(nt_status = make_auth_context(auth_context)))
-               return nt_status;
-       
-       for (;*text_list; text_list++) {
-               char *module_name = smb_xstrdup(*text_list);
-               char *module_params = NULL;
-               char *p;
-               const struct auth_operations *ops;
-
-               DEBUG(5,("make_auth_context_text_list: Attempting to find an auth method to match %s\n",
-                                       *text_list));
-
-               p = strchr(module_name, ':');
-               if (p) {
-                       *p = 0;
-                       module_params = p+1;
-                       trim_string(module_params, " ", " ");
-               }
 
-               trim_string(module_name, " ", " ");
+       if (!ev) {
+               DEBUG(0,("auth_context_create: called with out event context\n"));
+               return NT_STATUS_INTERNAL_ERROR;
+       }
 
-               ops = auth_backend_byname(module_name);
-               if (!ops) {
-                       DEBUG(5,("make_auth_context_text_list: Found auth method %s (at pos %d)\n", *text_list, i));
-                       SAFE_FREE(module_name);
-                       break;
-               }
+       if (!msg) {
+               DEBUG(0,("auth_context_create: called with out messaging context\n"));
+               return NT_STATUS_INTERNAL_ERROR;
+       }
 
-               if (NT_STATUS_IS_OK(ops->init(*auth_context, module_params, &t))) {
-                       DEBUG(5,("make_auth_context_text_list: auth method %s has a valid init\n",
-                                               *text_list));
-                       DLIST_ADD_END(list, t, struct auth_methods *);
-               } else {
-                       DEBUG(0,("make_auth_context_text_list: auth method %s did not correctly init\n",
-                                               *text_list));
+       ctx = talloc(mem_ctx, struct auth_context);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
+       ctx->challenge.set_by           = NULL;
+       ctx->challenge.may_be_modified  = false;
+       ctx->challenge.data             = data_blob(NULL, 0);
+       ctx->methods                    = NULL;
+       ctx->event_ctx                  = ev;
+       ctx->msg_ctx                    = msg;
+       ctx->lp_ctx                     = lp_ctx;
+
+       for (i=0; methods[i] ; i++) {
+               struct auth_method_context *method;
+
+               method = talloc(ctx, struct auth_method_context);
+               NT_STATUS_HAVE_NO_MEMORY(method);
+
+               method->ops = auth_backend_byname(methods[i]);
+               if (!method->ops) {
+                       DEBUG(1,("auth_context_create: failed to find method=%s\n",
+                               methods[i]));
+                       return NT_STATUS_INTERNAL_ERROR;
                }
-               SAFE_FREE(module_name);
+               method->auth_ctx        = ctx;
+               method->depth           = i;
+               DLIST_ADD_END(ctx->methods, method, struct auth_method_context *);
        }
-       
-       (*auth_context)->auth_method_list = list;
-       
-       return nt_status;
-}
-
-/***************************************************************************
- Make a auth_context struct for the auth subsystem
-***************************************************************************/
 
-NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context) 
-{
-       char **auth_method_list = NULL; 
-       NTSTATUS nt_status;
-
-       if (lp_auth_methods() && !str_list_copy(&auth_method_list, lp_auth_methods())) {
-               return NT_STATUS_NO_MEMORY;
+       if (!ctx->methods) {
+               return NT_STATUS_INTERNAL_ERROR;
        }
 
-       if (!NT_STATUS_IS_OK(nt_status = make_auth_context_text_list(auth_context, auth_method_list))) {
-               str_list_free(&auth_method_list);
-               return nt_status;
-       }
-       
-       str_list_free(&auth_method_list);
-       return nt_status;
-}
+       *auth_ctx = ctx;
 
+       return NT_STATUS_OK;
+}
 /***************************************************************************
- Make a auth_info struct with a fixed challenge
+ Make a auth_info struct for the auth subsystem
+ - Uses default auth_methods, depending on server role and smb.conf settings
 ***************************************************************************/
-
-NTSTATUS make_auth_context_fixed(struct auth_context **auth_context, uint8_t chal[8]) 
+NTSTATUS auth_context_create(TALLOC_CTX *mem_ctx, 
+                            struct event_context *ev,
+                            struct messaging_context *msg,
+                            struct loadparm_context *lp_ctx,
+                            struct auth_context **auth_ctx)
 {
-       NTSTATUS nt_status;
-       if (!NT_STATUS_IS_OK(nt_status = make_auth_context_subsystem(auth_context))) {
-               return nt_status;
+       const char **auth_methods = NULL;
+       switch (lp_server_role(lp_ctx)) {
+       case ROLE_STANDALONE:
+               auth_methods = lp_parm_string_list(mem_ctx, lp_ctx, NULL, "auth methods", "standalone", NULL);
+               break;
+       case ROLE_DOMAIN_MEMBER:
+               auth_methods = lp_parm_string_list(mem_ctx, lp_ctx, NULL, "auth methods", "member server", NULL);
+               break;
+       case ROLE_DOMAIN_CONTROLLER:
+               auth_methods = lp_parm_string_list(mem_ctx, lp_ctx, NULL, "auth methods", "domain controller", NULL);
+               break;
        }
-       
-       (*auth_context)->challenge = data_blob_talloc((*auth_context)->mem_ctx, chal, 8);
-       (*auth_context)->challenge_set_by = "fixed";
-       return nt_status;
+       return auth_context_create_methods(mem_ctx, auth_methods, ev, msg, lp_ctx, auth_ctx);
 }
 
+
 /* the list of currently registered AUTH backends */
-static struct {
+static struct auth_backend {
        const struct auth_operations *ops;
 } *backends = NULL;
 static int num_backends;
@@ -409,9 +447,8 @@ static int num_backends;
   The 'name' can be later used by other backends to find the operations
   structure for this backend.
 */
-static NTSTATUS auth_register(void *_ops)
+NTSTATUS auth_register(const struct auth_operations *ops)
 {
-       const struct auth_operations *ops = _ops;
        struct auth_operations *new_ops;
        
        if (auth_backend_byname(ops->name) != NULL) {
@@ -421,13 +458,14 @@ static NTSTATUS auth_register(void *_ops)
                return NT_STATUS_OBJECT_NAME_COLLISION;
        }
 
-       backends = Realloc(backends, sizeof(backends[0]) * (num_backends+1));
-       if (!backends) {
-               smb_panic("out of memory in auth_register");
-       }
+       backends = talloc_realloc(talloc_autofree_context(), backends, 
+                                 struct auth_backend, num_backends+1);
+       NT_STATUS_HAVE_NO_MEMORY(backends);
 
-       new_ops = smb_xmemdup(ops, sizeof(*ops));
-       new_ops->name = smb_xstrdup(ops->name);
+       new_ops = talloc_memdup(backends, ops, sizeof(*ops));
+       NT_STATUS_HAVE_NO_MEMORY(new_ops);
+       new_ops->name = talloc_strdup(new_ops, ops->name);
+       NT_STATUS_HAVE_NO_MEMORY(new_ops->name);
 
        backends[num_backends].ops = new_ops;
 
@@ -465,32 +503,30 @@ const struct auth_critical_sizes *auth_interface_version(void)
        static const struct auth_critical_sizes critical_sizes = {
                AUTH_INTERFACE_VERSION,
                sizeof(struct auth_operations),
-               sizeof(struct auth_methods),
+               sizeof(struct auth_method_context),
                sizeof(struct auth_context),
-               sizeof(struct auth_ntlmssp_state),
                sizeof(struct auth_usersupplied_info),
-               sizeof(struct auth_serversupplied_info),
-               sizeof(struct auth_str),
+               sizeof(struct auth_serversupplied_info)
        };
 
        return &critical_sizes;
 }
 
-/*
-  initialise the AUTH subsystem
-*/
-BOOL auth_init(void)
+NTSTATUS auth_init(void)
 {
-       NTSTATUS status;
+       static bool initialized = false;
 
-       status = register_subsystem("auth", auth_register); 
-       if (!NT_STATUS_IS_OK(status)) {
-               return False;
-       }
-
-       /* FIXME: Perhaps panic if a basic backend, such as SAM, fails to initialise? */
-       static_init_auth;
+       init_module_fn static_init[] = STATIC_auth_MODULES;
+       
+       if (initialized) return NT_STATUS_OK;
+       initialized = true;
+       
+       run_init_functions(static_init);
+       
+       return NT_STATUS_OK;    
+}
 
-       DEBUG(3,("AUTH subsystem version %d initialised\n", AUTH_INTERFACE_VERSION));
-       return True;
+NTSTATUS server_service_auth_init(void)
+{
+       return auth_init();
 }