Changeset 740 for vendor/current/source3/auth/auth_domain.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/auth/auth_domain.c (modified) (22 diffs)

vendor/current/source3/auth/auth_domain.c ¶

@@ -4 +4 @@
    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 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, see <http://www.gnu.org/licenses/>.
@@ -20 +20 @@
 
 #include "includes.h"
+#include "auth.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "rpc_client/cli_pipe.h"
+#include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
+#include "passdb.h"
+#include "libsmb/libsmb.h"
 
 #undef DBGC_CLASS
@@ -111 +118 @@
                                                 const char *dc_name,
                                                 struct sockaddr_storage *dc_ss, 
-                                                struct rpc_pipe_client **pipe_ret,
-                                                bool *retry)
+                                                struct rpc_pipe_client **pipe_ret)
 {
         NTSTATUS result;
@@ -139 +145 @@
                 return NT_STATUS_NO_LOGON_SERVERS;
         }
-        
+
         /* Attempt connection */
-        *retry = True;
         result = cli_full_connection(cli, global_myname(), dc_name, dc_ss, 0, 
-                "IPC$", "IPC", "", "", "", 0, Undefined, retry);
+                "IPC$", "IPC", "", "", "", 0, Undefined);
 
         if (!NT_STATUS_IS_OK(result)) {
@@ -252 +257 @@
 
 static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
-                                        const auth_usersupplied_info *user_info, 
+                                        const struct auth_usersupplied_info *user_info,
                                         const char *domain,
                                         uchar chal[8],
-                                        auth_serversupplied_info **server_info, 
+                                        struct auth_serversupplied_info **server_info,
                                         const char *dc_name,
                                         struct sockaddr_storage *dc_ss)
@@ -265 +270 @@
         NTSTATUS nt_status = NT_STATUS_NO_LOGON_SERVERS;
         int i;
-        bool retry = True;
 
         /*
@@ -276 +280 @@
 
         /* rety loop for robustness */
-        
-        for (i = 0; !NT_STATUS_IS_OK(nt_status) && retry && (i < 3); i++) {
+
+        for (i = 0; !NT_STATUS_IS_OK(nt_status) && (i < 3); i++) {
                 nt_status = connect_to_domain_password_server(&cli,
                                                         domain,
                                                         dc_name,
                                                         dc_ss,
-                                                        &netlogon_pipe,
-                                                        &retry);
+                                                        &netlogon_pipe);
         }
 
@@ -305 +308 @@
         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->smb_name,        /* user name logging on. */
-                                                      user_info->client_domain,   /* domain name */
-                                                      user_info->wksta_name,      /* workstation name */
-                                                      chal,                       /* 8 byte challenge. */
-                                                      3,                          /* validation level */
-                                                      user_info->lm_resp,         /* lanman 24 byte response */
-                                                      user_info->nt_resp,         /* nt 24 byte response */
-                                                      &info3);                    /* info3 out */
+                                                      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. */
+                                                      3,                                   /* validation level */
+                                                      user_info->password.response.lanman, /* lanman 24 byte response */
+                                                      user_info->password.response.nt,     /* 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);
 
@@ -324 +327 @@
                 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)));
 
@@ -334 +337 @@
         } else {
                 nt_status = make_server_info_info3(mem_ctx,
-                                                user_info->smb_name,
-                                                domain,
-                                                server_info,
-                                                info3);
+                                                   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->smb_name, info3);
-                TALLOC_FREE(info3);
+                        netsamlogon_cache_store(user_info->client.account_name, info3);
+                        TALLOC_FREE(info3);
+                }
         }
 
@@ -374 +364 @@
                                         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;
@@ -393 +383 @@
         }
 
+        DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
+
         /* 
          * Check that the requested domain is not our own machine name.
@@ -399 +391 @@
          */
 
-        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;
@@ -408 +400 @@
         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;
         }
-        
+
         nt_status = domain_client_validate(mem_ctx,
                                         user_info,
@@ -419 +411 @@
                                         dc_name,
                                         &dc_ss);
-                
+
         return nt_status;
 }
@@ -426 +418 @@
 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;
         }
-
-        (*auth_method)->name = "ntdomain";
-        (*auth_method)->auth = check_ntdomain_security;
+        result->name = "ntdomain";
+        result->auth = check_ntdomain_security;
+
+        *auth_method = result;
         return NT_STATUS_OK;
 }
@@ -443 +439 @@
                                            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;
@@ -457 +453 @@
         }
 
+        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;
         }
@@ -471 +469 @@
            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;
 
@@ -480 +478 @@
          */
 
-        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
@@ -505 +503 @@
         /* 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,
-                                        (uchar *)auth_context->challenge.data,
-                                        server_info,
-                                        dc_name,
-                                        &dc_ss);
+                                           user_info,
+                                           user_info->mapped.domain_name,
+                                           (uchar *)auth_context->challenge.data,
+                                           server_info,
+                                           dc_name,
+                                           &dc_ss);
 
         return nt_status;
@@ -526 +524 @@
 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;
         }
-
-        (*auth_method)->name = "trustdomain";
-        (*auth_method)->auth = check_trustdomain_security;
+        result->name = "trustdomain";
+        result->auth = check_trustdomain_security;
+
+        *auth_method = result;
         return NT_STATUS_OK;
 }