Mercurial > hg > nginx

comparison src/mail/ngx_mail_smtp_handler.c @ 1704:e584e946e198

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move condition declarations inside blocks where they are used
author Igor Sysoev <igor@sysoev.ru>
date Mon, 10 Dec 2007 12:09:51 +0000
parents 3c4111e07b58
children 7806f453183e
comparison
equal deleted inserted replaced
1703:43747661804d 1704:e584e946e198
317 static ngx_int_t 317 static ngx_int_t
318 ngx_mail_smtp_helo(ngx_mail_session_t *s, ngx_connection_t *c) 318 ngx_mail_smtp_helo(ngx_mail_session_t *s, ngx_connection_t *c)
319 { 319 {
320 ngx_str_t *arg; 320 ngx_str_t *arg;
321 ngx_mail_smtp_srv_conf_t *sscf; 321 ngx_mail_smtp_srv_conf_t *sscf;
322 #if (NGX_MAIL_SSL)
323 ngx_mail_ssl_conf_t *sslcf;
324 #endif
325 322
326 if (s->args.nelts != 1) { 323 if (s->args.nelts != 1) {
327 s->out.len = sizeof(smtp_invalid_argument) - 1; 324 s->out.len = sizeof(smtp_invalid_argument) - 1;
328 s->out.data = smtp_invalid_argument; 325 s->out.data = smtp_invalid_argument;
329 s->state = 0; 326 s->state = 0;
350 s->esmtp = 1; 347 s->esmtp = 1;
351 348
352 #if (NGX_MAIL_SSL) 349 #if (NGX_MAIL_SSL)
353 350
354 if (c->ssl == NULL) { 351 if (c->ssl == NULL) {
352 ngx_mail_ssl_conf_t *sslcf;
353
355 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module); 354 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
356 355
357 if (sslcf->starttls == NGX_MAIL_STARTTLS_ON) { 356 if (sslcf->starttls == NGX_MAIL_STARTTLS_ON) {
358 s->out = sscf->starttls_capability; 357 s->out = sscf->starttls_capability;
359 return NGX_OK; 358 return NGX_OK;