details: http://hg.nginx.org/nginx/rev/0d8c72ff62dd
branches:
changeset: 7268:0d8c72ff62dd
user: Maxim Dounin <mdounin@mdounin.ru>
date: Tue Apr 24 15:28:58 2018 +0300
description:
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".

diffstat:

src/mail/ngx_mail_ssl_module.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diffs (16 lines):

diff --git a/src/mail/ngx_mail_ssl_module.c b/src/mail/ngx_mail_ssl_module.c
--- 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;
}

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel