From: Timo Sirainen <tss@iki.fi>
Date: Tue, 14 Jan 2014 00:43:09 +0000 (+0200)
Subject: auth: Send original_user to auth client also when there aren't any extra fields.
X-Git-Tag: 2.2.11~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0693f78ec64fd8ffedbf84408e6b4fc9c4c2b89f;p=thirdparty%2Fdovecot%2Fcore.git

auth: Send original_user to auth client also when there aren't any extra fields.
---

diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c
index 65be9e114d..50a82e0898 100644
--- a/src/auth/auth-request-handler.c
+++ b/src/auth/auth-request-handler.c
@@ -166,12 +166,11 @@ auth_str_add_keyvalue(string_t *dest, const char *key, const char *value)
 static void
 auth_str_append_extra_fields(struct auth_request *request, string_t *dest)
 {
-	if (auth_fields_is_empty(request->extra_fields))
-		return;
-
-	str_append_c(dest, '\t');
-	auth_fields_append(request->extra_fields, dest,
-			   AUTH_FIELD_FLAG_HIDDEN, 0);
+	if (!auth_fields_is_empty(request->extra_fields)) {
+		str_append_c(dest, '\t');
+		auth_fields_append(request->extra_fields, dest,
+				   AUTH_FIELD_FLAG_HIDDEN, 0);
+	}
 
 	if (request->original_username != NULL &&
 	    null_strcmp(request->original_username, request->user) != 0) {