Mercurial > hg > nginx
annotate src/mail/ngx_mail_imap_module.c @ 6075:7fcfe113827d stable-1.6
Fixed possible buffer overrun in "too long header line" logging.
Additionally, ellipsis now always added to make it clear that
the header logged is incomplete.
Reported by Daniil Bondarev.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Wed, 08 Oct 2014 17:16:04 +0400 |
| parents | d620f497c50f |
| children | ec01b1d1fff1 |
| rev | line source |
|---|---|
| 521 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 521 | 5 */ |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 #include <ngx_event.h> | |
| 1136 | 11 #include <ngx_mail.h> |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
12 #include <ngx_mail_imap_module.h> |
| 521 | 13 |
| 14 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
15 static void *ngx_mail_imap_create_srv_conf(ngx_conf_t *cf); |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
16 static char *ngx_mail_imap_merge_srv_conf(ngx_conf_t *cf, void *parent, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
17 void *child); |
| 521 | 18 |
| 19 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
20 static ngx_str_t ngx_mail_imap_default_capabilities[] = { |
| 527 | 21 ngx_string("IMAP4"), |
| 22 ngx_string("IMAP4rev1"), | |
| 23 ngx_string("UIDPLUS"), | |
| 24 ngx_null_string | |
| 25 }; | |
| 26 | |
| 27 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
28 static ngx_conf_bitmask_t ngx_mail_imap_auth_methods[] = { |
| 1323 | 29 { ngx_string("plain"), NGX_MAIL_AUTH_PLAIN_ENABLED }, |
| 30 { ngx_string("login"), NGX_MAIL_AUTH_LOGIN_ENABLED }, | |
| 31 { ngx_string("cram-md5"), NGX_MAIL_AUTH_CRAM_MD5_ENABLED }, | |
| 32 { ngx_null_string, 0 } | |
| 33 }; | |
| 34 | |
| 35 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
36 static ngx_str_t ngx_mail_imap_auth_methods_names[] = { |
| 1323 | 37 ngx_string("AUTH=PLAIN"), |
| 38 ngx_string("AUTH=LOGIN"), | |
| 39 ngx_null_string, /* APOP */ | |
| 2309 | 40 ngx_string("AUTH=CRAM-MD5"), |
| 41 ngx_null_string /* NONE */ | |
| 1323 | 42 }; |
| 43 | |
| 44 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
45 static ngx_mail_protocol_t ngx_mail_imap_protocol = { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
46 ngx_string("imap"), |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
47 { 143, 993, 0, 0 }, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
48 NGX_MAIL_IMAP_PROTOCOL, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
49 |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
50 ngx_mail_imap_init_session, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
51 ngx_mail_imap_init_protocol, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
52 ngx_mail_imap_parse_command, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
53 ngx_mail_imap_auth_state, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
54 |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
55 ngx_string("* BAD internal server error" CRLF) |
| 1136 | 56 }; |
| 57 | |
| 58 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
59 static ngx_command_t ngx_mail_imap_commands[] = { |
| 521 | 60 |
| 61 { ngx_string("imap_client_buffer"), | |
| 1136 | 62 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
| 521 | 63 ngx_conf_set_size_slot, |
| 1136 | 64 NGX_MAIL_SRV_CONF_OFFSET, |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
65 offsetof(ngx_mail_imap_srv_conf_t, client_buffer_size), |
| 527 | 66 NULL }, |
| 67 | |
| 68 { ngx_string("imap_capabilities"), | |
| 1136 | 69 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_1MORE, |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
70 ngx_mail_capabilities, |
| 1136 | 71 NGX_MAIL_SRV_CONF_OFFSET, |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
72 offsetof(ngx_mail_imap_srv_conf_t, capabilities), |
| 800 | 73 NULL }, |
| 74 | |
| 1323 | 75 { ngx_string("imap_auth"), |
| 76 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_1MORE, | |
| 77 ngx_conf_set_bitmask_slot, | |
| 78 NGX_MAIL_SRV_CONF_OFFSET, | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
79 offsetof(ngx_mail_imap_srv_conf_t, auth_methods), |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
80 &ngx_mail_imap_auth_methods }, |
| 800 | 81 |
| 521 | 82 ngx_null_command |
| 83 }; | |
| 84 | |
| 85 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
86 static ngx_mail_module_t ngx_mail_imap_module_ctx = { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
87 &ngx_mail_imap_protocol, /* protocol */ |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
88 |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
89 NULL, /* create main configuration */ |
| 521 | 90 NULL, /* init main configuration */ |
| 91 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
92 ngx_mail_imap_create_srv_conf, /* create server configuration */ |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
93 ngx_mail_imap_merge_srv_conf /* merge server configuration */ |
| 521 | 94 }; |
| 95 | |
| 96 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
97 ngx_module_t ngx_mail_imap_module = { |
| 521 | 98 NGX_MODULE_V1, |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
99 &ngx_mail_imap_module_ctx, /* module context */ |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
100 ngx_mail_imap_commands, /* module directives */ |
| 1136 | 101 NGX_MAIL_MODULE, /* module type */ |
| 541 | 102 NULL, /* init master */ |
| 521 | 103 NULL, /* init module */ |
| 541 | 104 NULL, /* init process */ |
| 105 NULL, /* init thread */ | |
| 106 NULL, /* exit thread */ | |
| 107 NULL, /* exit process */ | |
| 108 NULL, /* exit master */ | |
| 109 NGX_MODULE_V1_PADDING | |
| 521 | 110 }; |
| 111 | |
| 112 | |
| 113 static void * | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
114 ngx_mail_imap_create_srv_conf(ngx_conf_t *cf) |
| 577 | 115 { |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
116 ngx_mail_imap_srv_conf_t *iscf; |
| 641 | 117 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
118 iscf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_imap_srv_conf_t)); |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
119 if (iscf == NULL) { |
| 527 | 120 return NULL; |
| 521 | 121 } |
| 122 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
123 iscf->client_buffer_size = NGX_CONF_UNSET_SIZE; |
| 521 | 124 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
125 if (ngx_array_init(&iscf->capabilities, cf->pool, 4, sizeof(ngx_str_t)) |
| 1136 | 126 != NGX_OK) |
| 127 { | |
| 128 return NULL; | |
| 129 } | |
| 130 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
131 return iscf; |
| 521 | 132 } |
| 133 | |
| 134 | |
| 135 static char * | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
136 ngx_mail_imap_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) |
| 521 | 137 { |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
138 ngx_mail_imap_srv_conf_t *prev = parent; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
139 ngx_mail_imap_srv_conf_t *conf = child; |
| 521 | 140 |
| 1322 | 141 u_char *p, *auth; |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
142 size_t size; |
| 527 | 143 ngx_str_t *c, *d; |
| 1136 | 144 ngx_uint_t i, m; |
| 527 | 145 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
146 ngx_conf_merge_size_value(conf->client_buffer_size, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
147 prev->client_buffer_size, |
|
1481
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
148 (size_t) ngx_pagesize); |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
149 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
150 ngx_conf_merge_bitmask_value(conf->auth_methods, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
151 prev->auth_methods, |
|
1481
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
152 (NGX_CONF_BITMASK_SET |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
153 |NGX_MAIL_AUTH_PLAIN_ENABLED)); |
| 1323 | 154 |
| 800 | 155 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
156 if (conf->capabilities.nelts == 0) { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
157 conf->capabilities = prev->capabilities; |
| 527 | 158 } |
| 159 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
160 if (conf->capabilities.nelts == 0) { |
| 527 | 161 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
162 for (d = ngx_mail_imap_default_capabilities; d->len; d++) { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
163 c = ngx_array_push(&conf->capabilities); |
| 527 | 164 if (c == NULL) { |
| 165 return NGX_CONF_ERROR; | |
| 166 } | |
| 167 | |
| 168 *c = *d; | |
| 169 } | |
| 170 } | |
| 171 | |
| 1136 | 172 size = sizeof("* CAPABILITY" CRLF) - 1; |
| 527 | 173 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
174 c = conf->capabilities.elts; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
175 for (i = 0; i < conf->capabilities.nelts; i++) { |
| 527 | 176 size += 1 + c[i].len; |
| 177 } | |
| 178 | |
| 1323 | 179 for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0; |
| 180 m <= NGX_MAIL_AUTH_CRAM_MD5_ENABLED; | |
| 181 m <<= 1, i++) | |
| 182 { | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
183 if (m & conf->auth_methods) { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
184 size += 1 + ngx_mail_imap_auth_methods_names[i].len; |
| 1323 | 185 } |
| 186 } | |
| 187 | |
| 2049 | 188 p = ngx_pnalloc(cf->pool, size); |
| 583 | 189 if (p == NULL) { |
| 190 return NGX_CONF_ERROR; | |
| 191 } | |
| 192 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
193 conf->capability.len = size; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
194 conf->capability.data = p; |
| 583 | 195 |
| 196 p = ngx_cpymem(p, "* CAPABILITY", sizeof("* CAPABILITY") - 1); | |
| 197 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
198 for (i = 0; i < conf->capabilities.nelts; i++) { |
| 583 | 199 *p++ = ' '; |
| 200 p = ngx_cpymem(p, c[i].data, c[i].len); | |
| 201 } | |
| 202 | |
| 1323 | 203 auth = p; |
| 204 | |
| 205 for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0; | |
| 206 m <= NGX_MAIL_AUTH_CRAM_MD5_ENABLED; | |
| 207 m <<= 1, i++) | |
| 208 { | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
209 if (m & conf->auth_methods) { |
| 1323 | 210 *p++ = ' '; |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
211 p = ngx_cpymem(p, ngx_mail_imap_auth_methods_names[i].data, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
212 ngx_mail_imap_auth_methods_names[i].len); |
| 1323 | 213 } |
| 214 } | |
| 215 | |
| 583 | 216 *p++ = CR; *p = LF; |
| 217 | |
| 218 | |
| 219 size += sizeof(" STARTTLS") - 1; | |
| 220 | |
| 2049 | 221 p = ngx_pnalloc(cf->pool, size); |
| 583 | 222 if (p == NULL) { |
| 527 | 223 return NGX_CONF_ERROR; |
| 224 } | |
| 225 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
226 conf->starttls_capability.len = size; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
227 conf->starttls_capability.data = p; |
| 527 | 228 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
229 p = ngx_cpymem(p, conf->capability.data, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
230 conf->capability.len - (sizeof(CRLF) - 1)); |
| 583 | 231 p = ngx_cpymem(p, " STARTTLS", sizeof(" STARTTLS") - 1); |
| 232 *p++ = CR; *p = LF; | |
| 233 | |
| 234 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
235 size = (auth - conf->capability.data) + sizeof(CRLF) - 1 |
| 1323 | 236 + sizeof(" STARTTLS LOGINDISABLED") - 1; |
| 583 | 237 |
| 2049 | 238 p = ngx_pnalloc(cf->pool, size); |
| 583 | 239 if (p == NULL) { |
| 240 return NGX_CONF_ERROR; | |
| 527 | 241 } |
| 242 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
243 conf->starttls_only_capability.len = size; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
244 conf->starttls_only_capability.data = p; |
| 527 | 245 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
246 p = ngx_cpymem(p, conf->capability.data, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
247 auth - conf->capability.data); |
| 1323 | 248 p = ngx_cpymem(p, " STARTTLS LOGINDISABLED", |
| 249 sizeof(" STARTTLS LOGINDISABLED") - 1); | |
| 583 | 250 *p++ = CR; *p = LF; |
| 251 | |
| 521 | 252 return NGX_CONF_OK; |
| 253 } |