Mercurial > hg > nginx
comparison src/mail/ngx_mail_ssl_module.c @ 7268:0d8c72ff62dd
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 |
comparison
equal
deleted
inserted
replaced
7267:7c614ef3c6ea | 7268:0d8c72ff62dd |
---|---|
348 | 348 |
349 if (conf->certificate_keys->nelts < conf->certificates->nelts) { | 349 if (conf->certificate_keys->nelts < conf->certificates->nelts) { |
350 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | 350 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |
351 "no \"ssl_certificate_key\" is defined " | 351 "no \"ssl_certificate_key\" is defined " |
352 "for certificate \"%V\" and " | 352 "for certificate \"%V\" and " |
353 "the \"ssl\" directive in %s:%ui", | 353 "the \"%s\" directive in %s:%ui", |
354 ((ngx_str_t *) conf->certificates->elts) | 354 ((ngx_str_t *) conf->certificates->elts) |
355 + conf->certificates->nelts - 1, | 355 + conf->certificates->nelts - 1, |
356 conf->file, conf->line); | 356 mode, conf->file, conf->line); |
357 return NGX_CONF_ERROR; | 357 return NGX_CONF_ERROR; |
358 } | 358 } |
359 | 359 |
360 } else { | 360 } else { |
361 | 361 |