Mercurial > hg > nginx

diff src/mail/ngx_mail_ssl_module.c @ 7268:0d8c72ff62dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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".
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 24 Apr 2018 15:28:58 +0300
parents 08dc60979133
children 7f955d3b9a0d
line wrap: on
line diff
--- 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, 
             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;
         }