Tidy up some formatting. Get ready for allowing bad password lockout. (based
[bbaumbach/samba-autobuild/.git] / source / auth / auth_sam.c
index a7e49a270f0172125201b831dddd3dba2c6e87c8..ce97bd7df267c61da055687b2a59e8c05889626e 100644 (file)
@@ -4,6 +4,7 @@
    Copyright (C) Andrew Tridgell              1992-2000
    Copyright (C) Luke Kenneth Casson Leighton 1996-2000
    Copyright (C) Andrew Bartlett              2001
+   Copyright (C) Gerald Carter                2003
    
    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
 #define DBGC_CLASS DBGC_AUTH
 
 /****************************************************************************
-core of smb password checking routine.
+ Core of smb password checking routine.
 ****************************************************************************/
-static BOOL smb_pwd_check_ntlmv1(DATA_BLOB nt_response,
+
+static BOOL smb_pwd_check_ntlmv1(const DATA_BLOB *nt_response,
                                 const uchar *part_passwd,
-                                DATA_BLOB sec_blob,
+                                const DATA_BLOB *sec_blob,
                                 uint8 user_sess_key[16])
 {
        /* Finish the encryption of part_passwd. */
@@ -42,46 +44,44 @@ static BOOL smb_pwd_check_ntlmv1(DATA_BLOB nt_response,
                return False;
        }
        
-       if (sec_blob.length != 8) {
-               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect challenge size (%d)\n", sec_blob.length));
+       if (sec_blob->length != 8) {
+               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect challenge size (%lu)\n", (unsigned long)sec_blob->length));
                return False;
        }
        
-       if (nt_response.length != 24) {
-               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect password length (%d)\n", nt_response.length));
+       if (nt_response->length != 24) {
+               DEBUG(0, ("smb_pwd_check_ntlmv1: incorrect password length (%lu)\n", (unsigned long)nt_response->length));
                return False;
        }
 
-       SMBOWFencrypt(part_passwd, sec_blob.data, p24);
-       if (user_sess_key != NULL)
-       {
+       SMBOWFencrypt(part_passwd, sec_blob->data, p24);
+       if (user_sess_key != NULL) {
                SMBsesskeygen_ntv1(part_passwd, NULL, user_sess_key);
        }
        
        
        
 #if DEBUG_PASSWORD
-       DEBUG(100,("Part password (P16) was |"));
+       DEBUG(100,("Part password (P16) was |\n"));
        dump_data(100, part_passwd, 16);
-       DEBUG(100,("Password from client was |"));
-       dump_data(100, nt_response.data, nt_response.length);
-       DEBUG(100,("Given challenge was |"));
-       dump_data(100, sec_blob.data, sec_blob.length);
-       DEBUG(100,("Value from encryption was |"));
+       DEBUGADD(100,("Password from client was |\n"));
+       dump_data(100, nt_response->data, nt_response->length);
+       DEBUGADD(100,("Given challenge was |\n"));
+       dump_data(100, sec_blob->data, sec_blob->length);
+       DEBUGADD(100,("Value from encryption was |\n"));
        dump_data(100, p24, 24);
 #endif
-  return (memcmp(p24, nt_response.data, 24) == 0);
+  return (memcmp(p24, nt_response->data, 24) == 0);
 }
 
-
 /****************************************************************************
-core of smb password checking routine. (NTLMv2, LMv2)
-
-Note:  The same code works with both NTLMv2 and LMv2.
+ Core of smb password checking routine. (NTLMv2, LMv2)
+ Note:  The same code works with both NTLMv2 and LMv2.
 ****************************************************************************/
-static BOOL smb_pwd_check_ntlmv2(const DATA_BLOB ntv2_response,
+
+static BOOL smb_pwd_check_ntlmv2(const DATA_BLOB *ntv2_response,
                                 const uchar *part_passwd,
-                                const DATA_BLOB sec_blob,
+                                const DATA_BLOB *sec_blob,
                                 const char *user, const char *domain,
                                 uint8 user_sess_key[16])
 {
@@ -91,60 +91,59 @@ static BOOL smb_pwd_check_ntlmv2(const DATA_BLOB ntv2_response,
        uchar client_response[16];
        DATA_BLOB client_key_data;
 
-       if (part_passwd == NULL)
-       {
+       if (part_passwd == NULL) {
                DEBUG(10,("No password set - DISALLOWING access\n"));
                /* No password set - always False */
                return False;
        }
 
-       if (ntv2_response.length < 16) {
+       if (ntv2_response->length < 24) {
                /* We MUST have more than 16 bytes, or the stuff below will go
-                  crazy... */
-               DEBUG(0, ("smb_pwd_check_ntlmv2: incorrect password length (%d)\n", 
-                         ntv2_response.length));
+                  crazy.  No known implementation sends less than the 24 bytes
+                  for LMv2, let alone NTLMv2. */
+               DEBUG(0, ("smb_pwd_check_ntlmv2: incorrect password length (%lu)\n", 
+                         (unsigned long)ntv2_response->length));
                return False;
        }
 
-       client_key_data = data_blob(ntv2_response.data+16, ntv2_response.length-16);
+       client_key_data = data_blob(ntv2_response->data+16, ntv2_response->length-16);
        /* 
           todo:  should we be checking this for anything?  We can't for LMv2, 
           but for NTLMv2 it is meant to contain the current time etc.
        */
 
-       memcpy(client_response, ntv2_response.data, sizeof(client_response));
+       memcpy(client_response, ntv2_response->data, sizeof(client_response));
 
        if (!ntv2_owf_gen(part_passwd, user, domain, kr)) {
                return False;
        }
 
-       SMBOWFencrypt_ntv2(kr, sec_blob, client_key_data, value_from_encryption);
-       if (user_sess_key != NULL)
-       {
+       SMBOWFencrypt_ntv2(kr, sec_blob, &client_key_data, value_from_encryption);
+       if (user_sess_key != NULL) {
                SMBsesskeygen_ntv2(kr, value_from_encryption, user_sess_key);
        }
 
 #if DEBUG_PASSWORD
-       DEBUG(100,("Part password (P16) was |"));
+       DEBUG(100,("Part password (P16) was |\n"));
        dump_data(100, part_passwd, 16);
-       DEBUG(100,("Password from client was |"));
-       dump_data(100, ntv2_response.data, ntv2_response.length);
-       DEBUG(100,("Variable data from client was |"));
+       DEBUGADD(100,("Password from client was |\n"));
+       dump_data(100, ntv2_response->data, ntv2_response->length);
+       DEBUGADD(100,("Variable data from client was |\n"));
        dump_data(100, client_key_data.data, client_key_data.length);
-       DEBUG(100,("Given challenge was |"));
-       dump_data(100, sec_blob.data, sec_blob.length);
-       DEBUG(100,("Value from encryption was |"));
+       DEBUGADD(100,("Given challenge was |\n"));
+       dump_data(100, sec_blob->data, sec_blob->length);
+       DEBUGADD(100,("Value from encryption was |\n"));
        dump_data(100, value_from_encryption, 16);
 #endif
        data_blob_clear_free(&client_key_data);
        return (memcmp(value_from_encryption, client_response, 16) == 0);
 }
 
-
 /****************************************************************************
  Do a specific test for an smb password being correct, given a smb_password and
  the lanman and NT responses.
 ****************************************************************************/
+
 static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
                                TALLOC_CTX *mem_ctx,
                                SAM_ACCOUNT *sampass, 
@@ -156,15 +155,11 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
        uint32 auth_flags;
 
        acct_ctrl = pdb_get_acct_ctrl(sampass);
-       if (acct_ctrl & ACB_PWNOTREQ) 
-       {
-               if (lp_null_passwords()) 
-               {
+       if (acct_ctrl & ACB_PWNOTREQ) {
+               if (lp_null_passwords()) {
                        DEBUG(3,("Account for user '%s' has no password and null passwords are allowed.\n", pdb_get_username(sampass)));
                        return(NT_STATUS_OK);
-               } 
-               else 
-               {
+               } else {
                        DEBUG(3,("Account for user '%s' has no password and null passwords are NOT allowed.\n", pdb_get_username(sampass)));
                        return(NT_STATUS_LOGON_FAILURE);
                }               
@@ -185,22 +180,20 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
                   use it (ie. does it exist in the smbpasswd file).
                */
                DEBUG(4,("sam_password_ok: Checking NTLMv2 password with domain [%s]\n", user_info->client_domain.str));
-               if (smb_pwd_check_ntlmv2( user_info->nt_resp, 
-                                         nt_pw, auth_context->challenge, 
+               if (smb_pwd_check_ntlmv2( &user_info->nt_resp, 
+                                         nt_pw, &auth_context->challenge, 
                                          user_info->smb_name.str, 
                                          user_info->client_domain.str,
-                                         user_sess_key))
-               {
+                                         user_sess_key)) {
                        return NT_STATUS_OK;
                }
 
                DEBUG(4,("sam_password_ok: Checking NTLMv2 password without a domain\n"));
-               if (smb_pwd_check_ntlmv2( user_info->nt_resp, 
-                                         nt_pw, auth_context->challenge, 
+               if (smb_pwd_check_ntlmv2( &user_info->nt_resp, 
+                                         nt_pw, &auth_context->challenge, 
                                          user_info->smb_name.str, 
                                          "",
-                                         user_sess_key))
-               {
+                                         user_sess_key)) {
                        return NT_STATUS_OK;
                } else {
                        DEBUG(3,("sam_password_ok: NTLMv2 password check failed\n"));
@@ -213,10 +206,9 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
                           use it (ie. does it exist in the smbpasswd file).
                        */
                        DEBUG(4,("sam_password_ok: Checking NT MD4 password\n"));
-                       if (smb_pwd_check_ntlmv1(user_info->nt_resp, 
-                                                nt_pw, auth_context->challenge,
-                                                user_sess_key)) 
-                       {
+                       if (smb_pwd_check_ntlmv1(&user_info->nt_resp, 
+                                                nt_pw, &auth_context->challenge,
+                                                user_sess_key)) {
                                return NT_STATUS_OK;
                        } else {
                                DEBUG(3,("sam_password_ok: NT MD4 password check failed for user %s\n",pdb_get_username(sampass)));
@@ -224,14 +216,14 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
                        }
                } else {
                        DEBUG(2,("sam_password_ok: NTLMv1 passwords NOT PERMITTED for user %s\n",pdb_get_username(sampass)));                   
-                       /* no return, because we might pick up LMv2 in the LM field */
+                       /* no return, becouse we might pick up LMv2 in the LM field */
                }
        }
        
        if (auth_flags & AUTH_FLAG_LM_RESP) {
                if (user_info->lm_resp.length != 24) {
-                       DEBUG(2,("sam_password_ok: invalid LanMan password length (%d) for user %s\n", 
-                                user_info->nt_resp.length, pdb_get_username(sampass)));                
+                       DEBUG(2,("sam_password_ok: invalid LanMan password length (%lu) for user %s\n", 
+                                (unsigned long)user_info->nt_resp.length, pdb_get_username(sampass)));         
                }
                
                if (!lp_lanman_auth()) {
@@ -242,10 +234,9 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
                        lm_pw = pdb_get_lanman_passwd(sampass);
                        
                        DEBUG(4,("sam_password_ok: Checking LM password\n"));
-                       if (smb_pwd_check_ntlmv1(user_info->lm_resp, 
-                                                lm_pw, auth_context->challenge,
-                                                user_sess_key)) 
-                       {
+                       if (smb_pwd_check_ntlmv1(&user_info->lm_resp, 
+                                                lm_pw, &auth_context->challenge,
+                                                user_sess_key)) {
                                return NT_STATUS_OK;
                        }
                }
@@ -261,22 +252,20 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
                   - related to Win9X, legacy NAS pass-though authentication
                */
                DEBUG(4,("sam_password_ok: Checking LMv2 password with domain %s\n", user_info->client_domain.str));
-               if (smb_pwd_check_ntlmv2( user_info->lm_resp, 
-                                         nt_pw, auth_context->challenge, 
+               if (smb_pwd_check_ntlmv2( &user_info->lm_resp, 
+                                         nt_pw, &auth_context->challenge, 
                                          user_info->smb_name.str, 
                                          user_info->client_domain.str,
-                                         user_sess_key))
-               {
+                                         user_sess_key)) {
                        return NT_STATUS_OK;
                }
 
                DEBUG(4,("sam_password_ok: Checking LMv2 password without a domain\n"));
-               if (smb_pwd_check_ntlmv2( user_info->lm_resp, 
-                                         nt_pw, auth_context->challenge, 
+               if (smb_pwd_check_ntlmv2( &user_info->lm_resp, 
+                                         nt_pw, &auth_context->challenge, 
                                          user_info->smb_name.str, 
                                          "",
-                                         user_sess_key))
-               {
+                                         user_sess_key)) {
                        return NT_STATUS_OK;
                }
 
@@ -284,12 +273,10 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
                   - I think this is related to Win9X pass-though authentication
                */
                DEBUG(4,("sam_password_ok: Checking NT MD4 password in LM field\n"));
-               if (lp_ntlm_auth()) 
-               {
-                       if (smb_pwd_check_ntlmv1(user_info->lm_resp, 
-                                                nt_pw, auth_context->challenge,
-                                                user_sess_key)) 
-                       {
+               if (lp_ntlm_auth()) {
+                       if (smb_pwd_check_ntlmv1(&user_info->lm_resp, 
+                                                nt_pw, &auth_context->challenge,
+                                                user_sess_key)) {
                                return NT_STATUS_OK;
                        }
                        DEBUG(3,("sam_password_ok: LM password, NT MD4 password in LM field and LMv2 failed for user %s\n",pdb_get_username(sampass)));
@@ -310,6 +297,7 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
  Do a specific test for a SAM_ACCOUNT being vaild for this connection 
  (ie not disabled, expired and the like).
 ****************************************************************************/
+
 static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                               SAM_ACCOUNT *sampass, 
                               const auth_usersupplied_info *user_info)
@@ -322,16 +310,22 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
 
        /* Quit if the account was disabled. */
        if (acct_ctrl & ACB_DISABLED) {
-               DEBUG(1,("Account for user '%s' was disabled.\n", pdb_get_username(sampass)));
+               DEBUG(1,("sam_account_ok: Account for user '%s' was disabled.\n", pdb_get_username(sampass)));
                return NT_STATUS_ACCOUNT_DISABLED;
        }
 
+       /* Quit if the account was locked out. */
+       if (acct_ctrl & ACB_AUTOLOCK) {
+               DEBUG(1,("sam_account_ok: Account for user %s was locked out.\n", pdb_get_username(sampass)));
+               return NT_STATUS_ACCOUNT_LOCKED_OUT;
+       }
+
        /* Test account expire time */
        
        kickoff_time = pdb_get_kickoff_time(sampass);
        if (kickoff_time != 0 && time(NULL) > kickoff_time) {
-               DEBUG(1,("Account for user '%s' has expried.\n", pdb_get_username(sampass)));
-               DEBUG(3,("Account expired at '%ld' unix time.\n", (long)kickoff_time));
+               DEBUG(1,("sam_account_ok: Account for user '%s' has expired.\n", pdb_get_username(sampass)));
+               DEBUG(3,("sam_account_ok: Account expired at '%ld' unix time.\n", (long)kickoff_time));
                return NT_STATUS_ACCOUNT_EXPIRED;
        }
 
@@ -341,14 +335,14 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
 
                /* check for immediate expiry "must change at next logon" */
                if (must_change_time == 0 && last_set_time != 0) {
-                       DEBUG(1,("Account for user '%s' password must change!.\n", pdb_get_username(sampass)));
+                       DEBUG(1,("sam_account_ok: Account for user '%s' password must change!.\n", pdb_get_username(sampass)));
                        return NT_STATUS_PASSWORD_MUST_CHANGE;
                }
 
                /* check for expired password */
                if (must_change_time < time(NULL) && must_change_time != 0) {
-                       DEBUG(1,("Account for user '%s' password expired!.\n", pdb_get_username(sampass)));
-                       DEBUG(1,("Password expired at '%s' (%ld) unix time.\n", http_timestring(must_change_time), (long)must_change_time));
+                       DEBUG(1,("sam_account_ok: Account for user '%s' password expired!.\n", pdb_get_username(sampass)));
+                       DEBUG(1,("sam_account_ok: Password expired at '%s' (%ld) unix time.\n", http_timestring(must_change_time), (long)must_change_time));
                        return NT_STATUS_PASSWORD_EXPIRED;
                }
        }
@@ -356,8 +350,8 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
        /* Test workstation. Workstation list is comma separated. */
 
        workstation_list = talloc_strdup(mem_ctx, pdb_get_workstations(sampass));
-
-       if (!workstation_list) return NT_STATUS_NO_MEMORY;
+       if (!workstation_list)
+               return NT_STATUS_NO_MEMORY;
 
        if (*workstation_list) {
                BOOL invalid_ws = True;
@@ -366,7 +360,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                fstring tok;
                        
                while (next_token(&s, tok, ",", sizeof(tok))) {
-                       DEBUG(10,("checking for workstation match %s and %s (len=%d)\n",
+                       DEBUG(10,("sam_account_ok: checking for workstation match %s and %s (len=%d)\n",
                                  tok, user_info->wksta_name.str, user_info->wksta_name.len));
                        if(strequal(tok, user_info->wksta_name.str)) {
                                invalid_ws = False;
@@ -396,7 +390,6 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-
 /****************************************************************************
 check if a username/password is OK assuming the password is a 24 byte
 SMB hash supplied in the user_info structure
@@ -431,21 +424,20 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
        ret = pdb_getsampwnam(sampass, user_info->internal_username.str);
        unbecome_root();
 
-       if (ret == False)
-       {
-               DEBUG(3,("Couldn't find user '%s' in passdb file.\n", user_info->internal_username.str));
+       if (ret == False) {
+               DEBUG(3,("check_sam_security: Couldn't find user '%s' in passdb file.\n", user_info->internal_username.str));
                pdb_free_sam(&sampass);
                return NT_STATUS_NO_SUCH_USER;
        }
 
-       nt_status = sam_account_ok(mem_ctx, sampass, user_info);
+       nt_status = sam_password_ok(auth_context, mem_ctx, sampass, user_info, user_sess_key);
        
        if (!NT_STATUS_IS_OK(nt_status)) {
                pdb_free_sam(&sampass);
                return nt_status;
        }
 
-       nt_status = sam_password_ok(auth_context, mem_ctx, sampass, user_info, user_sess_key);
+       nt_status = sam_account_ok(mem_ctx, sampass, user_info);
 
        if (!NT_STATUS_IS_OK(nt_status)) {
                pdb_free_sam(&sampass);
@@ -468,14 +460,14 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
 }
 
 /* module initialisation */
-NTSTATUS auth_init_sam(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+static NTSTATUS auth_init_sam_ignoredomain(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
 {
        if (!make_auth_methods(auth_context, auth_method)) {
                return NT_STATUS_NO_MEMORY;
        }
 
        (*auth_method)->auth = check_sam_security;      
-       (*auth_method)->name = "sam";
+       (*auth_method)->name = "sam_ignoredomain";
        return NT_STATUS_OK;
 }
 
@@ -490,83 +482,55 @@ static NTSTATUS check_samstrict_security(const struct auth_context *auth_context
                                         const auth_usersupplied_info *user_info, 
                                         auth_serversupplied_info **server_info)
 {
+       BOOL is_local_name, is_my_domain;
 
        if (!user_info || !auth_context) {
                return NT_STATUS_LOGON_FAILURE;
        }
 
-       /* If we are a domain member, we must not 
-          attempt to check the password locally,
-          unless it is one of our aliases. */
+       is_local_name = is_myname(user_info->domain.str);
+       is_my_domain  = strequal(user_info->domain.str, lp_workgroup());
+
+       /* check whether or not we service this domain/workgroup name */
        
-       if (!is_myname(user_info->domain.str)) {
-               DEBUG(7,("The requested user domain is not the local server name. [%s]\\[%s]\n",
-                       user_info->domain.str,user_info->internal_username.str));
-               return NT_STATUS_NO_SUCH_USER;
+       switch ( lp_server_role() ) {
+               case ROLE_STANDALONE:
+               case ROLE_DOMAIN_MEMBER:
+                       if ( !is_local_name ) {
+                               DEBUG(6,("check_samstrict_security: %s is not one of my local names (%s)\n",
+                                       user_info->domain.str, (lp_server_role() == ROLE_DOMAIN_MEMBER 
+                                       ? "ROLE_DOMAIN_MEMBER" : "ROLE_STANDALONE") ));
+                               return NT_STATUS_NOT_IMPLEMENTED;
+                       }
+               case ROLE_DOMAIN_PDC:
+               case ROLE_DOMAIN_BDC:
+                       if ( !is_local_name && !is_my_domain ) {
+                               DEBUG(6,("check_samstrict_security: %s is not one of my local names or domain name (DC)\n",
+                                       user_info->domain.str));
+                               return NT_STATUS_NOT_IMPLEMENTED;
+                       }
+               default: /* name is ok */
+                       break;
        }
        
        return check_sam_security(auth_context, my_private_data, mem_ctx, user_info, server_info);
 }
 
 /* module initialisation */
-NTSTATUS auth_init_samstrict(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
+static NTSTATUS auth_init_sam(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
 {
        if (!make_auth_methods(auth_context, auth_method)) {
                return NT_STATUS_NO_MEMORY;
        }
 
        (*auth_method)->auth = check_samstrict_security;
-       (*auth_method)->name = "samstrict";
-       return NT_STATUS_OK;
-}
-
-/****************************************************************************
-Check SAM security (above) but with a few extra checks if we're a DC.
-****************************************************************************/
-
-static NTSTATUS check_samstrict_dc_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)
-{
-
-       if (!user_info || !auth_context) {
-               return NT_STATUS_LOGON_FAILURE;
-       }
-
-       /* If we are a domain member, we must not 
-          attempt to check the password locally,
-          unless it is one of our aliases, empty
-          or our domain if we are a logon server.*/
-       
-
-       if ((!is_myworkgroup(user_info->domain.str))&&
-               (!is_myname(user_info->domain.str))) {
-               DEBUG(7,("The requested user domain is not the local server name or our domain. [%s]\\[%s]\n",
-                       user_info->domain.str,user_info->internal_username.str));
-               return NT_STATUS_NO_SUCH_USER;
-       }               
-
-       return check_sam_security(auth_context, my_private_data, mem_ctx, user_info, server_info);
-}
-
-/* module initialisation */
-NTSTATUS auth_init_samstrict_dc(struct auth_context *auth_context, const char *param, auth_methods **auth_method) 
-{
-       if (!make_auth_methods(auth_context, auth_method)) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       (*auth_method)->auth = check_samstrict_dc_security;
-       (*auth_method)->name = "samstrict_dc";
+       (*auth_method)->name = "sam";
        return NT_STATUS_OK;
 }
 
 NTSTATUS auth_sam_init(void)
 {
-       smb_register_auth(AUTH_INTERFACE_VERSION, "samstrict_dc", auth_init_samstrict_dc);
-       smb_register_auth(AUTH_INTERFACE_VERSION, "samstrict", auth_init_samstrict);
        smb_register_auth(AUTH_INTERFACE_VERSION, "sam", auth_init_sam);
+       smb_register_auth(AUTH_INTERFACE_VERSION, "sam_ignoredomain", auth_init_sam_ignoredomain);
        return NT_STATUS_OK;
 }