mirror of
https://github.com/samba-team/samba.git
synced 2025-01-26 10:04:02 +03:00
s3:auth: Remove trailing white spaces from auth_util.c
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Andreas Schneider
Andreas Schneider
parent
ad0c0dd071
commit
8f49616146
@ -144,14 +144,14 @@ NTSTATUS make_user_info_map(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
Create an auth_usersupplied_data, making the DATA_BLOBs here.
|
||||
Create an auth_usersupplied_data, making the DATA_BLOBs here.
|
||||
Decrypt and encrypt the passwords.
|
||||
****************************************************************************/
|
||||
|
||||
bool make_user_info_netlogon_network(TALLOC_CTX *mem_ctx,
|
||||
struct auth_usersupplied_info **user_info,
|
||||
const char *smb_name,
|
||||
const char *client_domain,
|
||||
const char *smb_name,
|
||||
const char *client_domain,
|
||||
const char *workstation_name,
|
||||
const struct tsocket_address *remote_address,
|
||||
const struct tsocket_address *local_address,
|
||||
@ -167,12 +167,12 @@ bool make_user_info_netlogon_network(TALLOC_CTX *mem_ctx,
|
||||
DATA_BLOB nt_blob = data_blob(nt_network_pwd, nt_pwd_len);
|
||||
|
||||
status = make_user_info_map(mem_ctx, user_info,
|
||||
smb_name, client_domain,
|
||||
smb_name, client_domain,
|
||||
workstation_name,
|
||||
remote_address,
|
||||
local_address,
|
||||
"SamLogon",
|
||||
lm_pwd_len ? &lm_blob : NULL,
|
||||
lm_pwd_len ? &lm_blob : NULL,
|
||||
nt_pwd_len ? &nt_blob : NULL,
|
||||
NULL, NULL, NULL,
|
||||
AUTH_PASSWORD_RESPONSE);
|
||||
@ -188,20 +188,20 @@ bool make_user_info_netlogon_network(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
Create an auth_usersupplied_data, making the DATA_BLOBs here.
|
||||
Create an auth_usersupplied_data, making the DATA_BLOBs here.
|
||||
Decrypt and encrypt the passwords.
|
||||
****************************************************************************/
|
||||
|
||||
bool make_user_info_netlogon_interactive(TALLOC_CTX *mem_ctx,
|
||||
struct auth_usersupplied_info **user_info,
|
||||
const char *smb_name,
|
||||
const char *client_domain,
|
||||
const char *smb_name,
|
||||
const char *client_domain,
|
||||
const char *workstation_name,
|
||||
const struct tsocket_address *remote_address,
|
||||
const struct tsocket_address *local_address,
|
||||
uint32_t logon_parameters,
|
||||
const uchar chal[8],
|
||||
const uchar lm_interactive_pwd[16],
|
||||
const uchar chal[8],
|
||||
const uchar lm_interactive_pwd[16],
|
||||
const uchar nt_interactive_pwd[16])
|
||||
{
|
||||
struct samr_Password lm_pwd;
|
||||
@ -250,7 +250,7 @@ bool make_user_info_netlogon_interactive(TALLOC_CTX *mem_ctx,
|
||||
|
||||
nt_status = make_user_info_map(
|
||||
mem_ctx,
|
||||
user_info,
|
||||
user_info,
|
||||
smb_name, client_domain, workstation_name,
|
||||
remote_address,
|
||||
local_address,
|
||||
@ -280,7 +280,7 @@ bool make_user_info_netlogon_interactive(TALLOC_CTX *mem_ctx,
|
||||
|
||||
bool make_user_info_for_reply(TALLOC_CTX *mem_ctx,
|
||||
struct auth_usersupplied_info **user_info,
|
||||
const char *smb_name,
|
||||
const char *smb_name,
|
||||
const char *client_domain,
|
||||
const struct tsocket_address *remote_address,
|
||||
const struct tsocket_address *local_address,
|
||||
@ -315,10 +315,10 @@ bool make_user_info_for_reply(TALLOC_CTX *mem_ctx,
|
||||
|
||||
/* We can't do an NT hash here, as the password needs to be
|
||||
case insensitive */
|
||||
local_nt_blob = data_blob_null;
|
||||
local_nt_blob = data_blob_null;
|
||||
} else {
|
||||
local_lm_blob = data_blob_null;
|
||||
local_nt_blob = data_blob_null;
|
||||
local_lm_blob = data_blob_null;
|
||||
local_nt_blob = data_blob_null;
|
||||
}
|
||||
|
||||
plaintext_password_string = talloc_strndup(talloc_tos(),
|
||||
@ -329,7 +329,7 @@ bool make_user_info_for_reply(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
ret = make_user_info(mem_ctx,
|
||||
user_info, smb_name, smb_name, client_domain, client_domain,
|
||||
user_info, smb_name, smb_name, client_domain, client_domain,
|
||||
get_remote_machine_name(),
|
||||
remote_address,
|
||||
local_address,
|
||||
@ -403,14 +403,14 @@ bool make_user_info_guest(TALLOC_CTX *mem_ctx,
|
||||
|
||||
nt_status = make_user_info(mem_ctx,
|
||||
user_info,
|
||||
"","",
|
||||
"","",
|
||||
"",
|
||||
"","",
|
||||
"","",
|
||||
"",
|
||||
remote_address,
|
||||
local_address,
|
||||
service_description,
|
||||
NULL, NULL,
|
||||
NULL, NULL,
|
||||
NULL, NULL,
|
||||
NULL, NULL,
|
||||
NULL,
|
||||
AUTH_PASSWORD_RESPONSE);
|
||||
|
||||
@ -1258,7 +1258,7 @@ done:
|
||||
}
|
||||
|
||||
session_info->unique_session_token = GUID_random();
|
||||
|
||||
|
||||
*session_info_out = talloc_move(mem_ctx, &session_info);
|
||||
TALLOC_FREE(frame);
|
||||
return NT_STATUS_OK;
|
||||
@ -1954,9 +1954,9 @@ static NTSTATUS check_account(TALLOC_CTX *mem_ctx, const char *domain,
|
||||
*pwd = passwd;
|
||||
|
||||
/* This is pointless -- there is no support for differing
|
||||
unix and windows names. Make sure to always store the
|
||||
unix and windows names. Make sure to always store the
|
||||
one we actually looked up and succeeded. Have I mentioned
|
||||
why I hate the 'winbind use default domain' parameter?
|
||||
why I hate the 'winbind use default domain' parameter?
|
||||
--jerry */
|
||||
|
||||
*found_username = talloc_strdup( mem_ctx, real_username );
|
||||
@ -1965,8 +1965,8 @@ static NTSTATUS check_account(TALLOC_CTX *mem_ctx, const char *domain,
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
Wrapper to allow the getpwnam() call to strip the domain name and
|
||||
try again in case a local UNIX user is already there. Also run through
|
||||
Wrapper to allow the getpwnam() call to strip the domain name and
|
||||
try again in case a local UNIX user is already there. Also run through
|
||||
the username if we fallback to the username only.
|
||||
****************************************************************************/
|
||||
|
||||
@ -1977,11 +1977,11 @@ struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, const char *domuser,
|
||||
char *p = NULL;
|
||||
const char *username = NULL;
|
||||
|
||||
/* we only save a copy of the username it has been mangled
|
||||
/* we only save a copy of the username it has been mangled
|
||||
by winbindd use default domain */
|
||||
*p_save_username = NULL;
|
||||
|
||||
/* don't call map_username() here since it has to be done higher
|
||||
/* don't call map_username() here since it has to be done higher
|
||||
up the stack so we don't call it multiple times */
|
||||
|
||||
username = talloc_strdup(mem_ctx, domuser);
|
||||
@ -2068,10 +2068,10 @@ username_only:
|
||||
}
|
||||
|
||||
/***************************************************************************
|
||||
Make a server_info struct from the info3 returned by a domain logon
|
||||
Make a server_info struct from the info3 returned by a domain logon
|
||||
***************************************************************************/
|
||||
|
||||
NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
|
||||
NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
|
||||
const char *sent_nt_username,
|
||||
const char *domain,
|
||||
struct auth_serversupplied_info **server_info,
|
||||
@ -2089,9 +2089,9 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
|
||||
struct dom_sid sid;
|
||||
TALLOC_CTX *tmp_ctx = talloc_stackframe();
|
||||
|
||||
/*
|
||||
/*
|
||||
Here is where we should check the list of
|
||||
trusted domains, and verify that the SID
|
||||
trusted domains, and verify that the SID
|
||||
matches.
|
||||
*/
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user