s3-secrets: only include secrets.h when needed.
[nivanova/samba-autobuild/.git] / source3 / auth / auth_domain.c
index 0f34bcc0e2a20062c56b95ba4afb5491351ac444..0fc6410fec3e70d5df698a7ef8cab37087a2681c 100644 (file)
    Authenticate against a remote domain
    Copyright (C) Andrew Tridgell 1992-1998
    Copyright (C) Andrew Bartlett 2001
-   
+
    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,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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 "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
 
-extern BOOL global_machine_password_needs_changing;
+extern bool global_machine_password_needs_changing;
+static struct named_mutex *mutex;
+
+/*
+ * Change machine password (called from main loop
+ * idle timeout. Must be done as root.
+ */
+
+void attempt_machine_password_change(void)
+{
+       unsigned char trust_passwd_hash[16];
+       time_t lct;
+       void *lock;
+
+       if (!global_machine_password_needs_changing) {
+               return;
+       }
+
+       if (lp_security() != SEC_DOMAIN) {
+               return;
+       }
+
+       /*
+        * We're in domain level security, and the code that
+        * read the machine password flagged that the machine
+        * password needs changing.
+        */
+
+       /*
+        * First, open the machine password file with an exclusive lock.
+        */
+
+       lock = secrets_get_trust_account_lock(NULL, lp_workgroup());
+
+       if (lock == NULL) {
+               DEBUG(0,("attempt_machine_password_change: unable to lock "
+                       "the machine account password for machine %s in "
+                       "domain %s.\n",
+                       global_myname(), lp_workgroup() ));
+               return;
+       }
+
+       if(!secrets_fetch_trust_account_password(lp_workgroup(),
+                       trust_passwd_hash, &lct, NULL)) {
+               DEBUG(0,("attempt_machine_password_change: unable to read the "
+                       "machine account password for %s in domain %s.\n",
+                       global_myname(), lp_workgroup()));
+               TALLOC_FREE(lock);
+               return;
+       }
+
+       /*
+        * Make sure someone else hasn't already done this.
+        */
+
+       if(time(NULL) < lct + lp_machine_password_timeout()) {
+               global_machine_password_needs_changing = false;
+               TALLOC_FREE(lock);
+               return;
+       }
+
+       /* always just contact the PDC here */
+
+       change_trust_account_password( lp_workgroup(), NULL);
+       global_machine_password_needs_changing = false;
+       TALLOC_FREE(lock);
+}
 
 /**
- * Connect to a remote server for domain security authenticaion.
+ * Connect to a remote server for (inter)domain security authenticaion.
  *
  * @param cli the cli to return containing the active connection
  * @param server either a machine name or text IP address to
  *               connect to.
+ * @param setup_creds_as domain account to setup credentials as
+ * @param sec_chan a switch value to distinguish between domain
+ *                 member and interdomain authentication
  * @param trust_passwd the trust password to establish the
- *                       credentials with.
+ *                     credentials with.
  *
  **/
 
-static NTSTATUS connect_to_domain_password_server(struct cli_state **cli, 
-                                                 const char *dc_name, struct in_addr dc_ip, 
-                                                 const char *setup_creds_as,
-                                                 uint16 sec_chan,
-                                                 const unsigned char *trust_passwd,
-                                                 BOOL *retry)
+static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
+                                               const char *domain,
+                                               const char *dc_name,
+                                               struct sockaddr_storage *dc_ss, 
+                                               struct rpc_pipe_client **pipe_ret,
+                                               bool *retry)
 {
         NTSTATUS result;
+       struct rpc_pipe_client *netlogon_pipe = NULL;
+
+       *cli = NULL;
+
+       *pipe_ret = NULL;
 
        /* TODO: Send a SAMLOGON request to determine whether this is a valid
           logonserver.  We can avoid a 30-second timeout if the DC is down
@@ -60,12 +137,14 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
         * ACCESS_DENIED errors if 2 auths are done from the same machine. JRA.
         */
 
-       if (!grab_server_mutex(dc_name))
+       mutex = grab_named_mutex(NULL, dc_name, 10);
+       if (mutex == NULL) {
                return NT_STATUS_NO_LOGON_SERVERS;
-       
+       }
+
        /* Attempt connection */
        *retry = True;
-       result = cli_full_connection(cli, global_myname(), dc_name, &dc_ip, 0, 
+       result = cli_full_connection(cli, global_myname(), dc_name, dc_ss, 0, 
                "IPC$", "IPC", "", "", "", 0, Undefined, retry);
 
        if (!NT_STATUS_IS_OK(result)) {
@@ -74,7 +153,12 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
                        result = NT_STATUS_NO_LOGON_SERVERS;
                }
 
-               release_server_mutex();
+               if (*cli) {
+                       cli_shutdown(*cli);
+                       *cli = NULL;
+               }
+
+               TALLOC_FREE(mutex);
                return result;
        }
 
@@ -91,37 +175,75 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
         * into account also. This patch from "Bjart Kvarme" <bjart.kvarme@usit.uio.no>.
         */
 
-       if(cli_nt_session_open(*cli, PI_NETLOGON) == False) {
+       /* open the netlogon pipe. */
+       if (lp_client_schannel()) {
+               /* We also setup the creds chain in the open_schannel call. */
+               result = cli_rpc_pipe_open_schannel(
+                       *cli, &ndr_table_netlogon.syntax_id, NCACN_NP,
+                       DCERPC_AUTH_LEVEL_PRIVACY, domain, &netlogon_pipe);
+       } else {
+               result = cli_rpc_pipe_open_noauth(
+                       *cli, &ndr_table_netlogon.syntax_id, &netlogon_pipe);
+       }
+
+       if (!NT_STATUS_IS_OK(result)) {
                DEBUG(0,("connect_to_domain_password_server: unable to open the domain client session to \
-machine %s. Error was : %s.\n", dc_name, cli_errstr(*cli)));
-               cli_nt_session_close(*cli);
-               cli_ulogoff(*cli);
+machine %s. Error was : %s.\n", dc_name, nt_errstr(result)));
                cli_shutdown(*cli);
-               release_server_mutex();
-               return NT_STATUS_NO_LOGON_SERVERS;
+               *cli = NULL;
+               TALLOC_FREE(mutex);
+               return result;
        }
 
-       fstr_sprintf((*cli)->mach_acct, "%s$", setup_creds_as);
+       if (!lp_client_schannel()) {
+               /* We need to set up a creds chain on an unauthenticated netlogon pipe. */
+               uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
+               enum netr_SchannelType sec_chan_type = 0;
+               unsigned char machine_pwd[16];
+               const char *account_name;
+
+               if (!get_trust_pw_hash(domain, machine_pwd, &account_name,
+                                      &sec_chan_type))
+               {
+                       DEBUG(0, ("connect_to_domain_password_server: could not fetch "
+                       "trust account password for domain '%s'\n",
+                               domain));
+                       cli_shutdown(*cli);
+                       *cli = NULL;
+                       TALLOC_FREE(mutex);
+                       return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+               }
 
-       if (!(*cli)->mach_acct) {
-               release_server_mutex();
-               return NT_STATUS_NO_MEMORY;
+               result = rpccli_netlogon_setup_creds(netlogon_pipe,
+                                       dc_name, /* server name */
+                                       domain, /* domain */
+                                       global_myname(), /* client name */
+                                       account_name, /* machine account name */
+                                       machine_pwd,
+                                       sec_chan_type,
+                                       &neg_flags);
+
+               if (!NT_STATUS_IS_OK(result)) {
+                       cli_shutdown(*cli);
+                       *cli = NULL;
+                       TALLOC_FREE(mutex);
+                       return result;
+               }
        }
 
-       result = cli_nt_establish_netlogon(*cli, sec_chan, trust_passwd);
-
-        if (!NT_STATUS_IS_OK(result)) {
-               DEBUG(0,("connect_to_domain_password_server: unable to setup the NETLOGON credentials to machine \
-%s. Error was : %s.\n", dc_name, nt_errstr(result)));
-               cli_nt_session_close(*cli);
-               cli_ulogoff(*cli);
+       if(!netlogon_pipe) {
+               DEBUG(0,("connect_to_domain_password_server: unable to open the domain client session to \
+machine %s. Error was : %s.\n", dc_name, cli_errstr(*cli)));
                cli_shutdown(*cli);
-               release_server_mutex();
-               return result;
+               *cli = NULL;
+               TALLOC_FREE(mutex);
+               return NT_STATUS_NO_LOGON_SERVERS;
        }
 
        /* We exit here with the mutex *locked*. JRA */
 
+       *pipe_ret = netlogon_pipe;
+
        return NT_STATUS_OK;
 }
 
@@ -132,21 +254,20 @@ machine %s. Error was : %s.\n", dc_name, cli_errstr(*cli)));
 ************************************************************************/
 
 static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
-                                      const auth_usersupplied_info *user_info, 
-                                      const char *domain,
-                                      uchar chal[8],
-                                      auth_serversupplied_info **server_info, 
-                                      const char *dc_name, struct in_addr dc_ip,
-                                      const char *setup_creds_as,
-                                      uint16 sec_chan,
-                                      unsigned char trust_passwd[16],
-                                      time_t last_change_time)
+                                       const struct auth_usersupplied_info *user_info,
+                                       const char *domain,
+                                       uchar chal[8],
+                                       struct auth_serversupplied_info **server_info,
+                                       const char *dc_name,
+                                       struct sockaddr_storage *dc_ss)
+
 {
-       NET_USER_INFO_3 info3;
+       struct netr_SamInfo3 *info3 = NULL;
        struct cli_state *cli = NULL;
+       struct rpc_pipe_client *netlogon_pipe = NULL;
        NTSTATUS nt_status = NT_STATUS_NO_LOGON_SERVERS;
        int i;
-       BOOL retry = True;
+       bool retry = True;
 
        /*
         * At this point, smb_apasswd points to the lanman response to
@@ -157,10 +278,14 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
         */
 
        /* rety loop for robustness */
-       
+
        for (i = 0; !NT_STATUS_IS_OK(nt_status) && retry && (i < 3); i++) {
-               nt_status = connect_to_domain_password_server(&cli, dc_name, dc_ip, setup_creds_as,
-                       sec_chan, trust_passwd, &retry);
+               nt_status = connect_to_domain_password_server(&cli,
+                                                       domain,
+                                                       dc_name,
+                                                       dc_ss,
+                                                       &netlogon_pipe,
+                                                       &retry);
        }
 
        if ( !NT_STATUS_IS_OK(nt_status) ) {
@@ -171,28 +296,37 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
                return nt_status;
        }
 
-       ZERO_STRUCT(info3);
+       /* store a successful connection */
+
+       saf_store( domain, cli->desthost );
 
         /*
          * If this call succeeds, we now have lots of info about the user
          * in the info3 structure.  
          */
 
-       nt_status = cli_netlogon_sam_network_logon(cli, mem_ctx,
-               NULL, user_info->smb_name.str, user_info->domain.str, 
-               user_info->wksta_name.str, chal, user_info->lm_resp, 
-               user_info->nt_resp, &info3);
-        
-       /* let go as soon as possible so we avoid any potential deadlocks
-          with winbind lookup up users or groups */
-          
-       release_server_mutex();
+       nt_status = rpccli_netlogon_sam_network_logon(netlogon_pipe,
+                                                     mem_ctx,
+                                                     user_info->logon_parameters,/* flags such as 'allow workstation logon' */ 
+                                                     dc_name,                    /* server name */
+                                                     user_info->client.account_name,        /* user name logging on. */
+                                                     user_info->client.domain_name,   /* domain name */
+                                                     user_info->workstation_name,/* workstation name */
+                                                     chal,                       /* 8 byte challenge. */
+                                                     user_info->lm_resp,         /* lanman 24 byte response */
+                                                     user_info->nt_resp,         /* nt 24 byte response */
+                                                     &info3);                    /* info3 out */
+
+       /* Let go as soon as possible so we avoid any potential deadlocks
+          with winbind lookup up users or groups. */
+
+       TALLOC_FREE(mutex);
 
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0,("domain_client_validate: unable to validate password "
                          "for user %s in domain %s to Domain controller %s. "
-                         "Error was %s.\n", user_info->smb_name.str,
-                         user_info->domain.str, cli->srv_name_slash, 
+                         "Error was %s.\n", user_info->client.account_name,
+                         user_info->client.domain_name, dc_name,
                          nt_errstr(nt_status)));
 
                /* map to something more useful */
@@ -200,33 +334,36 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
                        nt_status = NT_STATUS_NO_LOGON_SERVERS;
                }
        } else {
-               nt_status = make_server_info_info3(mem_ctx, user_info->internal_username.str, 
-                                                  user_info->smb_name.str, domain, server_info, &info3);
-               netsamlogon_cache_store( mem_ctx, &info3 );
-       }
-
-#if 0
-       /* 
-        * We don't actually need to do this - plus it fails currently with
-        * NT_STATUS_INVALID_INFO_CLASS - we need to know *exactly* what to
-        * send here. JRA.
-        */
-
-       if (NT_STATUS_IS_OK(status)) {
-               if(cli_nt_logoff(&cli, &ctr) == False) {
-                       DEBUG(0,("domain_client_validate: unable to log off user %s in domain \
-%s to Domain controller %s. Error was %s.\n", user, domain, dc_name, cli_errstr(&cli)));        
-                       nt_status = NT_STATUS_LOGON_FAILURE;
+               nt_status = make_server_info_info3(mem_ctx,
+                                               user_info->client.account_name,
+                                               domain,
+                                               server_info,
+                                               info3);
+
+               if (NT_STATUS_IS_OK(nt_status)) {
+                       (*server_info)->nss_token |= user_info->was_mapped;
+
+                       if ( ! (*server_info)->guest) {
+                               /* if a real user check pam account restrictions */
+                               /* only really perfomed if "obey pam restriction" is true */
+                               nt_status = smb_pam_accountcheck((*server_info)->unix_name);
+                               if (  !NT_STATUS_IS_OK(nt_status)) {
+                                       DEBUG(1, ("PAM account restriction prevents user login\n"));
+                                       cli_shutdown(cli);
+                                       TALLOC_FREE(info3);
+                                       return nt_status;
+                               }
+                       }
                }
+
+               netsamlogon_cache_store(user_info->client.account_name, info3);
+               TALLOC_FREE(info3);
        }
-#endif /* 0 */
 
        /* Note - once the cli stream is shutdown the mem_ctx used
           to allocate the other_sids and gids structures has been deleted - so
           these pointers are no longer valid..... */
 
-       cli_nt_session_close(cli);
-       cli_ulogoff(cli);
        cli_shutdown(cli);
        return nt_status;
 }
@@ -238,16 +375,13 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
 static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context,
                                        void *my_private_data, 
                                        TALLOC_CTX *mem_ctx,
-                                       const auth_usersupplied_info *user_info, 
-                                       auth_serversupplied_info **server_info)
+                                       const struct auth_usersupplied_info *user_info,
+                                       struct auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
-       unsigned char trust_passwd[16];
-       time_t last_change_time;
        const char *domain = lp_workgroup();
-       uint32 sec_channel_type = 0;
        fstring dc_name;
-       struct in_addr dc_ip;
+       struct sockaddr_storage dc_ss;
 
        if ( lp_server_role() != ROLE_DOMAIN_MEMBER ) {
                DEBUG(0,("check_ntdomain_security: Configuration error!  Cannot use "
@@ -260,61 +394,51 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
+       DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
+
        /* 
         * Check that the requested domain is not our own machine name.
         * If it is, we should never check the PDC here, we use our own local
         * password file.
         */
 
-       if(strequal(get_global_sam_name(), user_info->domain.str)) {
+       if(strequal(get_global_sam_name(), user_info->mapped.domain_name)) {
                DEBUG(3,("check_ntdomain_security: Requested domain was for this machine.\n"));
                return NT_STATUS_NOT_IMPLEMENTED;
        }
 
-       /*
-        * Get the machine account password for our primary domain
-        * No need to become_root() as secrets_init() is done at startup.
-        */
-
-       if (!secrets_fetch_trust_account_password(domain, trust_passwd, &last_change_time, &sec_channel_type))
-       {
-               DEBUG(0, ("check_ntdomain_security: could not fetch trust account password for domain '%s'\n", domain));
-               return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
-       }
-
-       /* Test if machine password has expired and needs to be changed */
-       if (lp_machine_password_timeout()) {
-               if (last_change_time > 0 && 
-                   time(NULL) > (last_change_time + 
-                                 lp_machine_password_timeout())) {
-                       global_machine_password_needs_changing = True;
-               }
-       }
-
        /* we need our DC to send the net_sam_logon() request to */
 
-       if ( !get_dc_name(domain, NULL, dc_name, &dc_ip) ) {
-               DEBUG(5,("check_trustdomain_security: unable to locate a DC for domain %s\n",
-                       user_info->domain.str));
+       if ( !get_dc_name(domain, NULL, dc_name, &dc_ss) ) {
+               DEBUG(5,("check_ntdomain_security: unable to locate a DC for domain %s\n",
+                       user_info->mapped.domain_name));
                return NT_STATUS_NO_LOGON_SERVERS;
        }
-       
-       nt_status = domain_client_validate(mem_ctx, user_info, domain,
-               (uchar *)auth_context->challenge.data, server_info, dc_name, dc_ip,
-               global_myname(), sec_channel_type,trust_passwd, last_change_time);
-               
+
+       nt_status = domain_client_validate(mem_ctx,
+                                       user_info,
+                                       domain,
+                                       (uchar *)auth_context->challenge.data,
+                                       server_info,
+                                       dc_name,
+                                       &dc_ss);
+
        return nt_status;
 }
 
 /* module initialisation */
 static NTSTATUS auth_init_ntdomain(struct auth_context *auth_context, const char* param, auth_methods **auth_method) 
 {
-       if (!make_auth_methods(auth_context, auth_method)) {
+       struct auth_methods *result;
+
+       result = TALLOC_ZERO_P(auth_context, struct auth_methods);
+       if (result == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
+       result->name = "ntdomain";
+       result->auth = check_ntdomain_security;
 
-       (*auth_method)->name = "ntdomain";
-       (*auth_method)->auth = check_ntdomain_security;
+        *auth_method = result;
        return NT_STATUS_OK;
 }
 
@@ -326,38 +450,38 @@ static NTSTATUS auth_init_ntdomain(struct auth_context *auth_context, const char
 static NTSTATUS check_trustdomain_security(const struct auth_context *auth_context,
                                           void *my_private_data, 
                                           TALLOC_CTX *mem_ctx,
-                                          const auth_usersupplied_info *user_info, 
-                                          auth_serversupplied_info **server_info)
+                                          const struct auth_usersupplied_info *user_info,
+                                          struct auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
        unsigned char trust_md4_password[16];
        char *trust_password;
-       time_t last_change_time;
-       DOM_SID sid;
        fstring dc_name;
-       struct in_addr dc_ip;
+       struct sockaddr_storage dc_ss;
 
        if (!user_info || !server_info || !auth_context) {
                DEBUG(1,("check_trustdomain_security: Critical variables not present.  Failing.\n"));
                return NT_STATUS_INVALID_PARAMETER;
        }
 
+       DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
+
        /* 
         * Check that the requested domain is not our own machine name or domain name.
         */
 
-       if( strequal(get_global_sam_name(), user_info->domain.str)) {
+       if( strequal(get_global_sam_name(), user_info->mapped.domain_name)) {
                DEBUG(3,("check_trustdomain_security: Requested domain [%s] was for this machine.\n",
-                       user_info->domain.str));
+                       user_info->mapped.domain_name));
                return NT_STATUS_NOT_IMPLEMENTED;
        }
 
        /* No point is bothering if this is not a trusted domain.
           This return makes "map to guest = bad user" work again.
           The logic is that if we know nothing about the domain, that
-          user is known to us and does not exist */
-       
-       if ( !is_trusted_domain( user_info->domain.str ) )
+          user is not known to us and does not exist */
+
+       if ( !is_trusted_domain( user_info->mapped.domain_name ) )
                return NT_STATUS_NOT_IMPLEMENTED;
 
        /*
@@ -365,21 +489,24 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
         * No need to become_root() as secrets_init() is done at startup.
         */
 
-       if (!secrets_fetch_trusted_domain_password(user_info->domain.str, &trust_password, &sid, &last_change_time))
-       {
-               DEBUG(0, ("check_trustdomain_security: could not fetch trust account password for domain %s\n", user_info->domain.str));
+       if (!pdb_get_trusteddom_pw(user_info->mapped.domain_name, &trust_password,
+                                  NULL, NULL)) {
+               DEBUG(0, ("check_trustdomain_security: could not fetch trust "
+                         "account password for domain %s\n",
+                         user_info->mapped.domain_name));
                return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
        }
 
 #ifdef DEBUG_PASSWORD
-       DEBUG(100, ("Trust password for domain %s is %s\n", user_info->domain.str, trust_password));
+       DEBUG(100, ("Trust password for domain %s is %s\n", user_info->mapped.domain_name,
+                   trust_password));
 #endif
        E_md4hash(trust_password, trust_md4_password);
        SAFE_FREE(trust_password);
 
 #if 0
        /* Test if machine password is expired and need to be changed */
-       if (time(NULL) > last_change_time + lp_machine_password_timeout())
+       if (time(NULL) > last_change_time + (time_t)lp_machine_password_timeout())
        {
                global_machine_password_needs_changing = True;
        }
@@ -387,16 +514,20 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
 
        /* use get_dc_name() for consistency even through we know that it will be 
           a netbios name */
-          
-       if ( !get_dc_name(user_info->domain.str, NULL, dc_name, &dc_ip) ) {
+
+       if ( !get_dc_name(user_info->mapped.domain_name, NULL, dc_name, &dc_ss) ) {
                DEBUG(5,("check_trustdomain_security: unable to locate a DC for domain %s\n",
-                       user_info->domain.str));
+                       user_info->mapped.domain_name));
                return NT_STATUS_NO_LOGON_SERVERS;
        }
-       
-       nt_status = domain_client_validate(mem_ctx, user_info, user_info->domain.str,
-               (uchar *)auth_context->challenge.data, server_info, dc_name, dc_ip,
-               lp_workgroup(), SEC_CHAN_DOMAIN, trust_md4_password, last_change_time);
+
+       nt_status = domain_client_validate(mem_ctx,
+                                       user_info,
+                                       user_info->mapped.domain_name,
+                                       (uchar *)auth_context->challenge.data,
+                                       server_info,
+                                       dc_name,
+                                       &dc_ss);
 
        return nt_status;
 }
@@ -404,12 +535,16 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
 /* module initialisation */
 static NTSTATUS auth_init_trustdomain(struct auth_context *auth_context, const char* param, auth_methods **auth_method) 
 {
-       if (!make_auth_methods(auth_context, auth_method)) {
+       struct auth_methods *result;
+
+       result = TALLOC_ZERO_P(auth_context, struct auth_methods);
+       if (result == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
+       result->name = "trustdomain";
+       result->auth = check_trustdomain_security;
 
-       (*auth_method)->name = "trustdomain";
-       (*auth_method)->auth = check_trustdomain_security;
+        *auth_method = result;
        return NT_STATUS_OK;
 }