From fc956cfcbb53103ed46a3729364e88536d569dc9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 1 Jun 2010 21:11:14 +1000 Subject: s3:auth Rename user_info->domain -> user_info->mapped.domain_name This is closer to the structure I want for a common struct auth_usersupplied_info. Andrew Bartlett --- source3/auth/auth_script.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/auth/auth_script.c') diff --git a/source3/auth/auth_script.c b/source3/auth/auth_script.c index 6d30058fe6c..2b83f80d983 100644 --- a/source3/auth/auth_script.c +++ b/source3/auth/auth_script.c @@ -62,7 +62,7 @@ static NTSTATUS script_check_user_credentials(const struct auth_context *auth_co return NT_STATUS_INVALID_PARAMETER; } - secret_str_len = strlen(user_info->domain) + 1 + + secret_str_len = strlen(user_info->mapped.domain_name) + 1 + strlen(user_info->client.account_name) + 1 + 16 + 1 + /* 8 bytes of challenge going to 16 */ 48 + 1 + /* 24 bytes of challenge going to 48 */ @@ -73,7 +73,7 @@ static NTSTATUS script_check_user_credentials(const struct auth_context *auth_co return NT_STATUS_NO_MEMORY; } - safe_strcpy( secret_str, user_info->domain, secret_str_len - 1); + safe_strcpy( secret_str, user_info->mapped.domain_name, secret_str_len - 1); safe_strcat( secret_str, "\n", secret_str_len - 1); safe_strcat( secret_str, user_info->client.account_name, secret_str_len - 1); safe_strcat( secret_str, "\n", secret_str_len - 1); @@ -109,7 +109,7 @@ static NTSTATUS script_check_user_credentials(const struct auth_context *auth_co if (ret) { DEBUG(1,("script_check_user_credentials: failed to authenticate %s\\%s\n", - user_info->domain, user_info->client.account_name )); + user_info->mapped.domain_name, user_info->client.account_name )); /* auth failed. */ return NT_STATUS_NO_SUCH_USER; } -- cgit