summaryrefslogtreecommitdiff
path: root/source3/auth
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-06-01 21:53:42 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-08-14 11:58:13 +1000
commite66f6e715fc98641f6cb20f137867723a315f672 (patch)
treef37a9f9f534f4837181c93d94e9e66082d947429 /source3/auth
parent23994e1b53b8528007f6325ce5f286712ec021be (diff)
downloadsamba-e66f6e715fc98641f6cb20f137867723a315f672.tar.gz
samba-e66f6e715fc98641f6cb20f137867723a315f672.tar.bz2
samba-e66f6e715fc98641f6cb20f137867723a315f672.zip
s3:auth Whitespace fixes after auth merge
Diffstat (limited to 'source3/auth')
-rw-r--r--source3/auth/auth.c2
-rw-r--r--source3/auth/auth_domain.c34
-rw-r--r--source3/auth/auth_netlogond.c4
3 files changed, 20 insertions, 20 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 5c50bb8826..ed8888ff93 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -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);
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 824618c63d..445aff51bb 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -307,15 +307,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. */
@@ -335,10 +335,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;
@@ -522,12 +522,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;
}
diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index 446b9e2ee4..889371c722 100644
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -84,8 +84,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 */