From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 12 Apr 2018 13:07:31 +0000 (+0300)
Subject: doveconf: Fix infinite loop when hiding sensitive information
X-Git-Tag: 2.3.4~306
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=858dac8ca2a1d8619c684fc64e974faa65a01bfd;p=thirdparty%2Fdovecot%2Fcore.git

doveconf: Fix infinite loop when hiding sensitive information

For example with "nopassword=y". Broken in
fc02343fd81a6fab272ac0366b15fc60ec44a8b6
---

diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index 1705329d80..873a3cb24b 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -222,6 +222,11 @@ hide_secrets_from_value(struct ostream *output, const char *key,
 					ptr++;
 			}
 			optr = ptr;
+		} else {
+			/* "secret" is prefixed with alphanumeric character,
+			   e.g. "nopassword". So it's not really a secret.
+			   Skip forward to avoid infinite loop. */
+			ptr++;
 		}
 	}
 	/* if we are dealing with output, send rest here */