From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 3 Aug 2020 14:32:34 +0000 (+0300)
Subject: auth: Add and use auth_request_set_realm()
X-Git-Tag: 2.3.13~320
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deaba55862f97dd04846f902c7493473f91e06f8;p=thirdparty%2Fdovecot%2Fcore.git

auth: Add and use auth_request_set_realm()
---

diff --git a/src/auth/auth-request-fields.c b/src/auth/auth-request-fields.c
index 19f6b9179c..d4cff16412 100644
--- a/src/auth/auth-request-fields.c
+++ b/src/auth/auth-request-fields.c
@@ -425,3 +425,10 @@ void auth_request_master_user_login_finish(struct auth_request *request)
 					 request->fields.requested_login_user);
 	request->fields.requested_login_user = NULL;
 }
+
+void auth_request_set_realm(struct auth_request *request, const char *realm)
+{
+	i_assert(realm != NULL);
+
+	request->fields.realm = p_strdup(request->pool, realm);
+}
diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
index 26de56d166..5666daeab5 100644
--- a/src/auth/auth-request.h
+++ b/src/auth/auth-request.h
@@ -236,6 +236,7 @@ void auth_request_set_username_forced(struct auth_request *request,
 bool auth_request_set_login_username(struct auth_request *request,
                                      const char *username,
                                      const char **error_r);
+void auth_request_set_realm(struct auth_request *request, const char *realm);
 
 void auth_request_set_field(struct auth_request *request,
 			    const char *name, const char *value,
diff --git a/src/auth/mech-digest-md5.c b/src/auth/mech-digest-md5.c
index b03ac771a2..d7f4383440 100644
--- a/src/auth/mech-digest-md5.c
+++ b/src/auth/mech-digest-md5.c
@@ -258,8 +258,7 @@ static bool auth_handle_response(struct digest_auth_request *request,
 
 	if (strcmp(key, "realm") == 0) {
 		if (request->auth_request.fields.realm == NULL && *value != '\0')
-			request->auth_request.fields.realm =
-				p_strdup(request->pool, value);
+			auth_request_set_realm(&request->auth_request, value);
 		return TRUE;
 	}