From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 7 Apr 2020 09:41:50 +0000 (+0300)
Subject: auth: Remove unnecessary NULL checks for adding event fields
X-Git-Tag: 2.3.11.2~458
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ef3d67e127f6294521c4a919c7d8d51c5efd425;p=thirdparty%2Fdovecot%2Fcore.git

auth: Remove unnecessary NULL checks for adding event fields

The NULL values are ignored internally. No need to complicate the code.
---

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index e7670f32a2..a7a20dac9b 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -217,16 +217,11 @@ auth_request_finished_event(struct auth_request *request, struct event *event)
 {
 	struct event_passthrough *e = event_create_passthrough(event);
 
-	if (request->user != NULL)
-		e->add_str("user", request->user);
-	if (request->original_username != NULL)
-		e->add_str("original_username", request->original_username);
-	if (request->translated_username != NULL)
-		e->add_str("translated_username", request->translated_username);
-	if (request->master_user != NULL) {
-		e->add_str("login_user", request->requested_login_user);
-		e->add_str("master_user", request->master_user);
-	}
+	e->add_str("user", request->user);
+	e->add_str("original_username", request->original_username);
+	e->add_str("translated_username", request->translated_username);
+	e->add_str("login_user", request->requested_login_user);
+	e->add_str("master_user", request->master_user);
 	if (request->failed) {
 		if (request->internal_failure) {
 			e->add_str("error", "internal failure");
@@ -252,10 +247,8 @@ auth_request_finished_event(struct auth_request *request, struct event *event)
 	if (request->userdb_lookup) {
 		return e;
 	}
-	if (request->credentials_scheme != NULL)
-		e->add_str("credentials_scheme", request->credentials_scheme);
-	if (request->realm != NULL)
-		e->add_str("realm", request->realm);
+	e->add_str("credentials_scheme", request->credentials_scheme);
+	e->add_str("realm", request->realm);
 	if (request->policy_penalty > 0)
 		e->add_int("policy_penalty", request->policy_penalty);
 	if (request->policy_refusal) {