Mercurial > hg > nginx-mail
comparison src/mail/ngx_mail_smtp_module.c @ 410:cd9cb7a3ff9e
Merge with nginx 0.7.8.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 11 Aug 2008 22:07:06 +0400 |
parents | 52b28d322d76 984bb0b1399b |
children | d67e93e97b4a |
comparison
equal
deleted
inserted
replaced
409:52b28d322d76 | 410:cd9cb7a3ff9e |
---|---|
160 | 160 |
161 cscf = ngx_mail_conf_get_module_srv_conf(cf, ngx_mail_core_module); | 161 cscf = ngx_mail_conf_get_module_srv_conf(cf, ngx_mail_core_module); |
162 | 162 |
163 size = sizeof("220 ESMTP ready" CRLF) - 1 + cscf->server_name.len; | 163 size = sizeof("220 ESMTP ready" CRLF) - 1 + cscf->server_name.len; |
164 | 164 |
165 p = ngx_palloc(cf->pool, size); | 165 p = ngx_pnalloc(cf->pool, size); |
166 if (p == NULL) { | 166 if (p == NULL) { |
167 return NGX_CONF_ERROR; | 167 return NGX_CONF_ERROR; |
168 } | 168 } |
169 | 169 |
170 conf->greeting.len = size; | 170 conf->greeting.len = size; |
175 ngx_memcpy(p, " ESMTP ready" CRLF, sizeof(" ESMTP ready" CRLF) - 1); | 175 ngx_memcpy(p, " ESMTP ready" CRLF, sizeof(" ESMTP ready" CRLF) - 1); |
176 | 176 |
177 | 177 |
178 size = sizeof("250 " CRLF) - 1 + cscf->server_name.len; | 178 size = sizeof("250 " CRLF) - 1 + cscf->server_name.len; |
179 | 179 |
180 p = ngx_palloc(cf->pool, size); | 180 p = ngx_pnalloc(cf->pool, size); |
181 if (p == NULL) { | 181 if (p == NULL) { |
182 return NGX_CONF_ERROR; | 182 return NGX_CONF_ERROR; |
183 } | 183 } |
184 | 184 |
185 conf->server_name.len = size; | 185 conf->server_name.len = size; |
214 | 214 |
215 if (smtp_auth_enabled) { | 215 if (smtp_auth_enabled) { |
216 size += sizeof("250 AUTH") - 1 + sizeof(CRLF) - 1; | 216 size += sizeof("250 AUTH") - 1 + sizeof(CRLF) - 1; |
217 } | 217 } |
218 | 218 |
219 p = ngx_palloc(cf->pool, size); | 219 p = ngx_pnalloc(cf->pool, size); |
220 if (p == NULL) { | 220 if (p == NULL) { |
221 return NGX_CONF_ERROR; | 221 return NGX_CONF_ERROR; |
222 } | 222 } |
223 | 223 |
224 conf->capability.len = size; | 224 conf->capability.len = size; |
261 last[3] = ' '; | 261 last[3] = ' '; |
262 } | 262 } |
263 | 263 |
264 size += sizeof("250 STARTTLS" CRLF) - 1; | 264 size += sizeof("250 STARTTLS" CRLF) - 1; |
265 | 265 |
266 p = ngx_palloc(cf->pool, size); | 266 p = ngx_pnalloc(cf->pool, size); |
267 if (p == NULL) { | 267 if (p == NULL) { |
268 return NGX_CONF_ERROR; | 268 return NGX_CONF_ERROR; |
269 } | 269 } |
270 | 270 |
271 conf->starttls_capability.len = size; | 271 conf->starttls_capability.len = size; |
282 *p = '-'; | 282 *p = '-'; |
283 | 283 |
284 size = (auth - conf->capability.data) | 284 size = (auth - conf->capability.data) |
285 + sizeof("250 STARTTLS" CRLF) - 1; | 285 + sizeof("250 STARTTLS" CRLF) - 1; |
286 | 286 |
287 p = ngx_palloc(cf->pool, size); | 287 p = ngx_pnalloc(cf->pool, size); |
288 if (p == NULL) { | 288 if (p == NULL) { |
289 return NGX_CONF_ERROR; | 289 return NGX_CONF_ERROR; |
290 } | 290 } |
291 | 291 |
292 conf->starttls_only_capability.len = size; | 292 conf->starttls_only_capability.len = size; |