s3-auth remove sanitized_username from auth_serversupplied_info

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>

5 files changed, 1 insertions, 41 deletions

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index e6d8e16b8e..b8cc871b62 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -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) {
diff --git a/source3/auth/server_info_sam.c b/source3/auth/server_info_sam.c
index 261e3de8f2..5d657f90c8 100644
--- a/source3/auth/server_info_sam.c
+++ b/source3/auth/server_info_sam.c
@@ -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.
diff --git a/source3/include/auth.h b/source3/include/auth.h
index 5c842fd550..be23adb4a7 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -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 {
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2619e7bbde..47321f3aa4 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -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  */
 
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index baa5a1f046..8f4098651d 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -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);
-}