From 1e410cc4de6865b7f5ce788d2e38fc9cb62c62b4 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 24 Mar 2020 21:05:17 +0100
Subject: [PATCH] lib-smtp: smtp-server-cmd-vrfy - Restructure parameter
 parsing.

---
 src/lib-smtp/smtp-server-cmd-vrfy.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/lib-smtp/smtp-server-cmd-vrfy.c b/src/lib-smtp/smtp-server-cmd-vrfy.c
index dc5777ac3e..6eb2ae82dd 100644
--- a/src/lib-smtp/smtp-server-cmd-vrfy.c
+++ b/src/lib-smtp/smtp-server-cmd-vrfy.c
@@ -18,15 +18,12 @@ void smtp_server_cmd_vrfy(struct smtp_server_cmd_ctx *cmd,
 
 	/* vrfy = "VRFY" SP String CRLF */
 	ret = smtp_string_parse(params, &param, &error);
-	if (ret <= 0) {
-		if (ret < 0) {
-			smtp_server_reply(cmd, 501, "5.5.4",
-					  "Invalid string parameter: %s",
-					  error);
-		} else {
-			smtp_server_reply(cmd, 501, "5.5.4",
-					  "Invalid parameters");
-		}
+	if (ret < 0) {
+		smtp_server_reply(cmd, 501, "5.5.4",
+				  "Invalid string parameter: %s", error);
+		return;
+	} else if (ret == 0) {
+		smtp_server_reply(cmd, 501, "5.5.4", "Invalid parameters");
 		return;
 	}
 
-- 
2.47.3