s3:auth Whitespace fixes after auth merge
authorAndrew Bartlett <abartlet@samba.org>
Tue, 1 Jun 2010 11:53:42 +0000 (21:53 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 12 Jul 2010 04:36:29 +0000 (14:36 +1000)
source3/auth/auth.c
source3/auth/auth_domain.c
source3/auth/auth_netlogond.c

index aaedc857043f71ca19aa435d1cd0fce0d38774b8..ad857511af2c1a8ac1ad4412345618aacd2c7a47 100644 (file)
@@ -248,7 +248,7 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
                NTSTATUS result;
 
                mem_ctx = talloc_init("%s authentication for user %s\\%s", auth_method->name,
-                                           user_info->mapped.domain_name, user_info->client.account_name);
+                                     user_info->mapped.domain_name, user_info->client.account_name);
 
                result = auth_method->auth(auth_context, auth_method->private_data, mem_ctx, user_info, server_info);
 
index 2045e1928e44fc9b67401e7e2e390ef58e959255..96fc42bb275c6008f799bd193f8260bf76bb0968 100644 (file)
@@ -306,15 +306,15 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
 
        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->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->password.response.lanman, /* lanman 24 byte response */
                                                      user_info->password.response.nt,     /* nt 24 byte response */
-                                                     &info3);                    /* info3 out */
+                                                     &info3);                             /* info3 out */
 
        /* Let go as soon as possible so we avoid any potential deadlocks
           with winbind lookup up users or groups. */
@@ -334,10 +334,10 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
                }
        } else {
                nt_status = make_server_info_info3(mem_ctx,
-                                               user_info->client.account_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;
@@ -521,12 +521,12 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
        }
 
        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);
+                                          user_info,
+                                          user_info->mapped.domain_name,
+                                          (uchar *)auth_context->challenge.data,
+                                          server_info,
+                                          dc_name,
+                                          &dc_ss);
 
        return nt_status;
 }
index b54e87e04abb54d1c3565a89f1f47a2fec23b722..8a1c90cc2fc5db2931c2ab410df9146e2dbf819b 100644 (file)
@@ -83,8 +83,8 @@ static NTSTATUS netlogond_validate(TALLOC_CTX *mem_ctx,
                user_info->logon_parameters,           /* flags such as 'allow
                                                        * workstation logon' */
                global_myname(),                       /* server name */
-               user_info->client.account_name,                   /* user name logging on. */
-               user_info->client.domain_name,              /* domain name */
+               user_info->client.account_name,        /* user name logging on. */
+               user_info->client.domain_name,         /* domain name */
                user_info->workstation_name,           /* workstation name */
                (uchar *)auth_context->challenge.data, /* 8 byte challenge. */
                user_info->password.response.lanman,   /* lanman 24 byte response */