sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3-auth remove sanitized_username from auth_serversupplied_info

Browse Source 
This structure element was only written to, not read.

It is filled into the companion structure, auth_session_info()
by create_local_token().

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Andrew Bartlett 2011-07-26 13:43:33 +10:00
parent 9a45bf3952
commit 1aced1e989
5 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/auth/auth_util.c
View File

@ -753,10 +753,8 @@ NTSTATUS make_server_info_pw(struct auth_serversupplied_info **server_info,
}
result->unix_name = talloc_strdup(result, unix_username);
result->sanitized_username = sanitize_username(result, unix_username);
if ((result->unix_name == NULL)
|| (result->sanitized_username == NULL)) {
if (result->unix_name == NULL) {
TALLOC_FREE(result);
return NT_STATUS_NO_MEMORY;
}
@ -1043,12 +1041,6 @@ static struct auth_serversupplied_info *copy_session_info_serverinfo_guest(TALLO
return NULL;
}
dst->sanitized_username = talloc_strdup(dst, src->unix_info->sanitized_username);
if (!dst->sanitized_username) {
TALLOC_FREE(dst);
return NULL;
}
return dst;
}
@ -1413,13 +1405,6 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
result->unix_name = talloc_strdup(result, found_username);
result->sanitized_username = sanitize_username(result,
result->unix_name);
if (result->sanitized_username == NULL) {
TALLOC_FREE(result);
return NT_STATUS_NO_MEMORY;
}
/* copy in the info3 */
result->info3 = i3 = copy_netr_SamInfo3(result, info3);
if (result->info3 == NULL) {

7
source3/auth/server_info_sam.c
View File

@ -92,13 +92,6 @@ NTSTATUS make_server_info_sam(struct auth_serversupplied_info **server_info,
TALLOC_FREE(pwd);
result->sanitized_username = sanitize_username(result,
result->unix_name);
if (result->sanitized_username == NULL) {
TALLOC_FREE(result);
return NT_STATUS_NO_MEMORY;
}
if (IS_DC && is_our_machine_account(username)) {
/*
* This is a hack of monstrous proportions.

9
source3/include/auth.h
View File

@ -66,15 +66,6 @@ struct auth_serversupplied_info {
bool nss_token;
char *unix_name;
/*
* For performance reasons we keep an alpha_strcpy-sanitized version
* of the username around as long as the global variable current_user
* still exists. If we did not do keep this, we'd have to call
* alpha_strcpy whenever we do a become_user(), potentially on every
* smb request. See set_current_user_info.
*/
char *sanitized_username;
};
struct auth_context {

1
source3/include/proto.h
View File

@ -893,7 +893,6 @@ bool validate_net_name( const char *name,
int max_len);
char *escape_shell_string(const char *src);
char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
char *sanitize_username(TALLOC_CTX *mem_ctx, const char *username);
/* The following definitions come from lib/version.c */

8
source3/lib/util_str.c
View File

@ -1277,11 +1277,3 @@ char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
TALLOC_FREE(s);
return list;
}
char *sanitize_username(TALLOC_CTX *mem_ctx, const char *username)
{
fstring tmp;
alpha_strcpy(tmp, username, ". _-$", sizeof(tmp));
return talloc_strdup(mem_ctx, tmp);
}