comparison src/mail/ngx_mail_core_module.c @ 405:05c02cbce7be PATCH_NGINX_MAIL_0_4

Mail: reduce diffs.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 24 Jul 2007 00:28:22 +0000
parents 481e8f936572
children 52b28d322d76
comparison
equal deleted inserted replaced
404:481e8f936572 405:05c02cbce7be
688 p = conf->smtp_starttls_capability.data 688 p = conf->smtp_starttls_capability.data
689 + (last - conf->smtp_capability.data) + 3; 689 + (last - conf->smtp_capability.data) + 3;
690 *p = '-'; 690 *p = '-';
691 691
692 size = (auth - conf->smtp_capability.data) 692 size = (auth - conf->smtp_capability.data)
693 + sizeof("250 STARTTLS" CRLF) - 1; 693 + sizeof("250 STARTTLS" CRLF) - 1;
694 694
695 p = ngx_palloc(cf->pool, size); 695 p = ngx_palloc(cf->pool, size);
696 if (p == NULL) { 696 if (p == NULL) {
697 return NGX_CONF_ERROR; 697 return NGX_CONF_ERROR;
698 } 698 }
701 conf->smtp_starttls_only_capability.data = p; 701 conf->smtp_starttls_only_capability.data = p;
702 702
703 p = ngx_cpymem(p, conf->smtp_capability.data, 703 p = ngx_cpymem(p, conf->smtp_capability.data,
704 auth - conf->smtp_capability.data); 704 auth - conf->smtp_capability.data);
705 705
706 p = ngx_cpymem(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1); 706 ngx_memcpy(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1);
707 707
708 if (last < auth) { 708 if (last < auth) {
709 p = conf->smtp_starttls_only_capability.data 709 p = conf->smtp_starttls_only_capability.data
710 + (last - conf->smtp_capability.data) + 3; 710 + (last - conf->smtp_capability.data) + 3;
711 *p = '-'; 711 *p = '-';