summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-06-01 21:08:38 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-06-07 23:34:28 +1000
commitdeabae191b34bdd350c7fe6c0c9ad05defa8d08c (patch)
treef42612c8f6907738940447afdb659db3d57644ff
parente21935fc74e8bd64bbd231d6388ea424708c3acd (diff)
downloadsamba-deabae191b34bdd350c7fe6c0c9ad05defa8d08c.tar.gz
samba-deabae191b34bdd350c7fe6c0c9ad05defa8d08c.tar.bz2
samba-deabae191b34bdd350c7fe6c0c9ad05defa8d08c.zip
s3:auth Rename user_info->client_domain -> user_info->client.domain_name
This is closer to the structure I want for a common struct auth_usersupplied_info. Andrew Bartlett
-rw-r--r--source3/auth/auth.c2
-rw-r--r--source3/auth/auth_domain.c4
-rw-r--r--source3/auth/auth_netlogond.c2
-rw-r--r--source3/auth/check_samsec.c2
-rw-r--r--source3/auth/user_info.c6
-rw-r--r--source3/include/auth.h2
6 files changed, 9 insertions, 9 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 2801fc32dc..8d351ae390 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -214,7 +214,7 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
return NT_STATUS_LOGON_FAILURE;
DEBUG(3, ("check_ntlm_password: Checking password for unmapped user [%s]\\[%s]@[%s] with the new password interface\n",
- user_info->client_domain, user_info->client.account_name, user_info->workstation_name));
+ user_info->client.domain_name, user_info->client.account_name, user_info->workstation_name));
DEBUG(3, ("check_ntlm_password: mapped user is: [%s]\\[%s]@[%s]\n",
user_info->domain, user_info->mapped.account_name, user_info->workstation_name));
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 30d81a6c12..aea82ed66c 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -309,7 +309,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *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, /* domain name */
+ 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 */
@@ -325,7 +325,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
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->client.account_name,
- user_info->client_domain, dc_name,
+ user_info->client.domain_name, dc_name,
nt_errstr(nt_status)));
/* map to something more useful */
diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index bb900ce4a2..947fd3a429 100644
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -84,7 +84,7 @@ static NTSTATUS netlogond_validate(TALLOC_CTX *mem_ctx,
* workstation logon' */
global_myname(), /* server name */
user_info->client.account_name, /* user name logging on. */
- user_info->client_domain, /* domain name */
+ user_info->client.domain_name, /* domain name */
user_info->workstation_name, /* workstation name */
(uchar *)auth_context->challenge.data, /* 8 byte challenge. */
user_info->lm_resp, /* lanman 24 byte response */
diff --git a/source3/auth/check_samsec.c b/source3/auth/check_samsec.c
index 04ec10f1e8..5228811422 100644
--- a/source3/auth/check_samsec.c
+++ b/source3/auth/check_samsec.c
@@ -100,7 +100,7 @@ static NTSTATUS sam_password_ok(TALLOC_CTX *mem_ctx,
&user_info->lm_resp, &user_info->nt_resp,
username,
user_info->client.account_name,
- user_info->client_domain,
+ user_info->client.domain_name,
lm_hash,
nt_hash,
user_sess_key, lm_sess_key);
diff --git a/source3/auth/user_info.c b/source3/auth/user_info.c
index ca492d4135..fdf80344cd 100644
--- a/source3/auth/user_info.c
+++ b/source3/auth/user_info.c
@@ -70,8 +70,8 @@ NTSTATUS make_user_info(struct auth_usersupplied_info **user_info,
return NT_STATUS_NO_MEMORY;
}
- (*user_info)->client_domain = SMB_STRDUP(client_domain);
- if ((*user_info)->client_domain == NULL) {
+ (*user_info)->client.domain_name = SMB_STRDUP(client_domain);
+ if ((*user_info)->client.domain_name == NULL) {
free_user_info(user_info);
return NT_STATUS_NO_MEMORY;
}
@@ -119,8 +119,8 @@ void free_user_info(struct auth_usersupplied_info **user_info)
}
SAFE_FREE((*user_info)->client.account_name);
SAFE_FREE((*user_info)->mapped.account_name);
- SAFE_FREE((*user_info)->client_domain);
SAFE_FREE((*user_info)->domain);
+ SAFE_FREE((*user_info)->client.domain_name);
SAFE_FREE((*user_info)->workstation_name);
data_blob_free(&(*user_info)->lm_resp);
data_blob_free(&(*user_info)->nt_resp);
diff --git a/source3/include/auth.h b/source3/include/auth.h
index 71b944f804..5a494537d1 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -29,10 +29,10 @@ struct auth_usersupplied_info {
bool encrypted;
struct {
char *account_name; /* username before/after mapping */
+ char *domain_name; /* username before/after mapping */
} client, mapped;
bool was_mapped; /* Did the username map actually match? */
- char *client_domain; /* domain name string */
char *domain; /* domain name after mapping */
char *internal_username; /* username after mapping */
const char *workstation_name; /* workstation name (netbios calling