From: Maxim Dounin <mdounin@mdounin.ru>
Date: Tue, 24 Apr 2018 12:28:58 +0000 (+0300)
Subject: Mail: fixed error message about missing ssl_certificate_key.
X-Git-Tag: release-1.15.0~19
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=5d3a854ebd4f59854ade798b94070ff1ee3eddcf;p=nginx.git

Mail: fixed error message about missing ssl_certificate_key.

In 51e1f047d15d, the "ssl" directive name was incorrectly hardcoded
in the error message shown when there are some SSL keys defined, but
not for all certificates.  Right approach is to use the "mode" variable,
which can be either "ssl" or "starttls".
---

diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
index aebd179d0..7cfd3b9fb 100644
--- a/src/mail/ngx_mail_ssl_module.c
+++ b/src/mail/ngx_mail_ssl_module.c
@@ -350,10 +350,10 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
             ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                           "no \"ssl_certificate_key\" is defined "
                           "for certificate \"%V\" and "
-                          "the \"ssl\" directive in %s:%ui",
+                          "the \"%s\" directive in %s:%ui",
                           ((ngx_str_t *) conf->certificates->elts)
                           + conf->certificates->nelts - 1,
-                          conf->file, conf->line);
+                          mode, conf->file, conf->line);
             return NGX_CONF_ERROR;
         }