# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1185236902 0
# Node ID 05c02cbce7be96d0b5e5b9cc581f7752f8ea2e71
# Parent  481e8f936572366d9730f8816fc7d10d9b774af0
Mail: reduce diffs.

diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -690,7 +690,7 @@ ngx_mail_core_merge_srv_conf(ngx_conf_t 
     *p = '-';
 
     size = (auth - conf->smtp_capability.data)
-        + sizeof("250 STARTTLS" CRLF) - 1; 
+            + sizeof("250 STARTTLS" CRLF) - 1;
 
     p = ngx_palloc(cf->pool, size);
     if (p == NULL) {
@@ -703,7 +703,7 @@ ngx_mail_core_merge_srv_conf(ngx_conf_t 
     p = ngx_cpymem(p, conf->smtp_capability.data,
                    auth - conf->smtp_capability.data);
 
-    p = ngx_cpymem(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1);
+    ngx_memcpy(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1);
 
     if (last < auth) {
         p = conf->smtp_starttls_only_capability.data