s3-secrets: only include secrets.h when needed.

[nivanova/samba-autobuild/.git] / source3 / auth / auth_domain.c

diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 3a9da2cc686e4ddcb7b82dd58d685fcc2475cbbb..0fc6410fec3e70d5df698a7ef8cab37087a2681c 100644 (file)
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -20,6 +20,9 @@
 
 #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
@@ -306,9 +309,9 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
                                                      mem_ctx,
                                                      user_info->logon_parameters,/* flags such as 'allow workstation logon' */ 
                                                      dc_name,                    /* server name */
-                                                     user_info->smb_name,        /* user name logging on. */
-                                                     user_info->client_domain,   /* domain name */
-                                                     user_info->wksta_name,      /* workstation 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 */
@@ -322,8 +325,8 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
        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,
-                         user_info->client_domain, dc_name, 
+                         "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 */
@@ -332,7 +335,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
                }
        } else {
                nt_status = make_server_info_info3(mem_ctx,
-                                               user_info->smb_name,
+                                               user_info->client.account_name,
                                                domain,
                                                server_info,
                                                info3);
@@ -353,7 +356,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
                        }
                }
 
-               netsamlogon_cache_store(user_info->smb_name, info3);
+               netsamlogon_cache_store(user_info->client.account_name, info3);
                TALLOC_FREE(info3);
        }
 
@@ -391,13 +394,15 @@ 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)) {
+       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;
        }
@@ -406,7 +411,7 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context,
 
        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->domain));
+                       user_info->mapped.domain_name));
                return NT_STATUS_NO_LOGON_SERVERS;
        }
 
@@ -459,13 +464,15 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
                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)) {
+       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));
+                       user_info->mapped.domain_name));
                return NT_STATUS_NOT_IMPLEMENTED;
        }
 
@@ -474,7 +481,7 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
           The logic is that if we know nothing about the domain, that
           user is not known to us and does not exist */
 
-       if ( !is_trusted_domain( user_info->domain ) )
+       if ( !is_trusted_domain( user_info->mapped.domain_name ) )
                return NT_STATUS_NOT_IMPLEMENTED;
 
        /*
@@ -482,16 +489,16 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
         * No need to become_root() as secrets_init() is done at startup.
         */
 
-       if (!pdb_get_trusteddom_pw(user_info->domain, &trust_password,
+       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->domain));
+                         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,
+       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);
@@ -508,15 +515,15 @@ 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, NULL, dc_name, &dc_ss) ) {
+       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));
+                       user_info->mapped.domain_name));
                return NT_STATUS_NO_LOGON_SERVERS;
        }
 
        nt_status = domain_client_validate(mem_ctx,
                                        user_info,
-                                       user_info->domain,
+                                       user_info->mapped.domain_name,
                                        (uchar *)auth_context->challenge.data,
                                        server_info,
                                        dc_name,