From: Ralph Boehme <slow@samba.org>
Date: Fri, 17 Jan 2020 18:31:06 +0000 (+0100)
Subject: s4/auth: use talloc_alpha_strcpy() in auth_session_info_fill_unix()
X-Git-Tag: ldb-2.1.1~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1b2254f45ec6b4aa7dc846dd4b9be0b2f48d7a5;p=thirdparty%2Fsamba.git

s4/auth: use talloc_alpha_strcpy() in auth_session_info_fill_unix()

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source4/auth/unix_token.c b/source4/auth/unix_token.c
index f3a93b658e5..c1b39ccf3de 100644
--- a/source4/auth/unix_token.c
+++ b/source4/auth/unix_token.c
@@ -142,8 +142,6 @@ NTSTATUS auth_session_info_fill_unix(struct loadparm_context *lp_ctx,
 				     const char *original_user_name,
 				     struct auth_session_info *session_info)
 {
-	char *su;
-	size_t len;
 	NTSTATUS status = security_token_to_unix_token(session_info,
 						       session_info->security_token,
 						       &session_info->unix_token);
@@ -164,12 +162,11 @@ NTSTATUS auth_session_info_fill_unix(struct loadparm_context *lp_ctx,
 		original_user_name = session_info->unix_info->unix_name;
 	}
 
-	len = strlen(original_user_name) + 1;
-	session_info->unix_info->sanitized_username = su = talloc_array(session_info->unix_info, char, len);
-	NT_STATUS_HAVE_NO_MEMORY(su);
-
-	alpha_strcpy(su, original_user_name,
-		     ". _-$", len);
+	session_info->unix_info->sanitized_username =
+		talloc_alpha_strcpy(session_info->unix_info,
+				    original_user_name,
+				    ". _-$");
+	NT_STATUS_HAVE_NO_MEMORY(session_info->unix_info->sanitized_username);
 
 	return NT_STATUS_OK;
 }