From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 16 Aug 2016 09:28:27 +0000 (+0300)
Subject: doveconf: hide ssl_key and ssl_dh without -P
X-Git-Tag: 2.3.0.rc1~3146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef55b1574428382f343b48e60da721ff58cdbe98;p=thirdparty%2Fdovecot%2Fcore.git

doveconf: hide ssl_key and ssl_dh without -P
---

diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index 63ae419855..93601583e6 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -304,7 +304,9 @@ config_dump_human_output(struct config_dump_human_context *ctx,
 		o_stream_nsend(output, key, value-key);
 		o_stream_nsend_str(output, " = ");
 		if (hide_passwords && value[1] != '\0' &&
-		    value-key > 9 && strncmp(value-9, "_password", 9) == 0) {
+		    ((value-key > 9 && strncmp(value-9, "_password", 9) == 0) ||
+		     strncmp(key, "ssl_key",7) == 0 ||
+		     strncmp(key, "ssl_dh",6) == 0))  {
 			o_stream_nsend_str(output, " # hidden, use -P to show it");
 		} else if (!value_need_quote(value+1))
 			o_stream_nsend_str(output, value+1);