From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 6 Aug 2019 20:09:53 +0000 (+0200)
Subject: lib-storage: mail-user - Add auth_mech field to struct mail_user.
X-Git-Tag: 2.3.9~327
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5d128c59da46be1189483656b8345c9ad79112f;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mail-user - Add auth_mech field to struct mail_user.
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index f3b9081d33..e7f948086f 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -684,6 +684,7 @@ mail_storage_service_init_post(struct mail_storage_service_ctx *ctx,
 	mail_user->gid = priv->gid == (gid_t)-1 ? getegid() : priv->gid;
 	mail_user->anonymous = user->anonymous;
 	mail_user->admin = user->admin;
+	mail_user->auth_mech = p_strdup(mail_user->pool, user->auth_mech);
 	mail_user->auth_token = p_strdup(mail_user->pool, user->auth_token);
 	mail_user->auth_user = p_strdup(mail_user->pool, user->auth_user);
 	if (user->input.session_create_time != 0) {
diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index 42ec840b17..c414fccddd 100644
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -679,6 +679,7 @@ struct mail_user *mail_user_dup(struct mail_user *user)
 	user2->gid = user->gid;
 	user2->anonymous = user->anonymous;
 	user2->admin = user->admin;
+	user2->auth_mech = p_strdup(user2->pool, user->auth_mech);
 	user2->auth_token = p_strdup(user2->pool, user->auth_token);
 	user2->auth_user = p_strdup(user2->pool, user->auth_user);
 	user2->session_id = p_strdup(user2->pool, user->session_id);
diff --git a/src/lib-storage/mail-user.h b/src/lib-storage/mail-user.h
index a670f0f14d..fb12131a8d 100644
--- a/src/lib-storage/mail-user.h
+++ b/src/lib-storage/mail-user.h
@@ -46,7 +46,7 @@ struct mail_user {
 	const char *service;
 	const char *session_id;
 	struct mail_user_connection_data conn;
-	const char *auth_token, *auth_user;
+	const char *auth_mech, *auth_token, *auth_user;
 	const char *const *userdb_fields;
 	/* Timestamp when this session was initially created. Most importantly
 	   this stays the same after IMAP client is hibernated and restored. */