Mercurial > hg > nginx-mail

comparison src/mail/ngx_mail_proxy_module.c @ 404:481e8f936572

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mail: rename "unauth" to "none".
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 23 Jul 2007 23:30:01 +0000
parents f1e2fab7a46c
children fa809001e681
comparison
equal deleted inserted replaced
403:d4cac61d8e95 404:481e8f936572
516 516
517 p = ngx_cpymem(p, cscf->server_name.data, cscf->server_name.len); 517 p = ngx_cpymem(p, cscf->server_name.data, cscf->server_name.len);
518 *p++ = CR; *p = LF; 518 *p++ = CR; *p = LF;
519 519
520 s->mail_state = pcf->xclient ? ngx_smtp_helo_xclient : 520 s->mail_state = pcf->xclient ? ngx_smtp_helo_xclient :
521 s->auth_method == NGX_MAIL_AUTH_UNAUTH ? 521 s->auth_method == NGX_MAIL_AUTH_NONE ?
522 ngx_smtp_helo_from : ngx_smtp_helo; 522 ngx_smtp_helo_from : ngx_smtp_helo;
523 523
524 break; 524 break;
525 525
526 case ngx_smtp_helo_xclient: 526 case ngx_smtp_helo_xclient:
547 (s->smtp_helo.len ? " HELO=" : ""), &s->smtp_helo, 547 (s->smtp_helo.len ? " HELO=" : ""), &s->smtp_helo,
548 &s->connection->addr_text, 548 &s->connection->addr_text,
549 (s->login.len ? " LOGIN=" : ""), &s->login) 549 (s->login.len ? " LOGIN=" : ""), &s->login)
550 - line.data; 550 - line.data;
551 551
552 s->mail_state = s->auth_method == NGX_MAIL_AUTH_UNAUTH ? 552 s->mail_state = s->auth_method == NGX_MAIL_AUTH_NONE ?
553 ngx_smtp_xclient_from : ngx_smtp_xclient; 553 ngx_smtp_xclient_from : ngx_smtp_xclient;
554 554
555 break; 555 break;
556 556
557 case ngx_smtp_helo_from: 557 case ngx_smtp_helo_from:
597 597
598 case ngx_smtp_helo: 598 case ngx_smtp_helo:
599 case ngx_smtp_xclient: 599 case ngx_smtp_xclient:
600 case ngx_smtp_to: 600 case ngx_smtp_to:
601 601
602 if (s->auth_method == NGX_MAIL_AUTH_UNAUTH) { 602 if (s->auth_method == NGX_MAIL_AUTH_NONE) {
603 ngx_memcpy(s->proxy->buffer->start, smtp_ok, sizeof(smtp_ok) - 1); 603 ngx_memcpy(s->proxy->buffer->start, smtp_ok, sizeof(smtp_ok) - 1);
604 s->proxy->buffer->last = s->proxy->buffer->start 604 s->proxy->buffer->last = s->proxy->buffer->start
605 + sizeof(smtp_ok) - 1; 605 + sizeof(smtp_ok) - 1;
606 } else { 606 } else {
607 ngx_memcpy(s->proxy->buffer->start, smtp_auth_ok, 607 ngx_memcpy(s->proxy->buffer->start, smtp_auth_ok,