Remove "userdom_struct user" from "struct user_struct"

(This used to be commit 420de035237bb08bc470c9eb820f3da2edaa6805)

2 files changed, 9 insertions, 3 deletions

diff --git a/source3/include/auth.h b/source3/include/auth.h
index a7531b35cd..df2bed8756 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -69,7 +69,15 @@ typedef struct auth_serversupplied_info {
 
 	bool was_mapped;	/* Did the username map match? */
 	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;
 } auth_serversupplied_info;
 
 struct auth_context {
diff --git a/source3/include/smb.h b/source3/include/smb.h
index d1af77d1d6..47a11f51a0 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1778,8 +1778,6 @@ typedef struct user_struct {
 	struct user_struct *next, *prev;
 	uint16 vuid; /* Tag for this entry. */
 
-	userdom_struct user;
-
 	char *session_keystr; /* used by utmp and pam session code.  
 				 TDB key string */
 	int homes_snum;