comparison src/smtp_in.c @ 135:b072426cc6bb

fixed defer_all code it was broken during refactoring this morning
author meillo@marmaro.de
date Tue, 06 Jul 2010 13:46:51 +0200
parents f9d5469cb648
children 6b78aaced5e1
comparison
equal deleted inserted replaced
134:43a9447c3583 135:b072426cc6bb
174 smtp_printf(out, "220 %s MasqMail %s ESMTP\r\n", conf.host_name, VERSION); 174 smtp_printf(out, "220 %s MasqMail %s ESMTP\r\n", conf.host_name, VERSION);
175 175
176 while ((len = read_sockline(in, buffer, BUF_LEN, 5 * 60, READSOCKL_CHUG)) >= 0) { 176 while ((len = read_sockline(in, buffer, BUF_LEN, 5 * 60, READSOCKL_CHUG)) >= 0) {
177 cmd_id = get_id(buffer); 177 cmd_id = get_id(buffer);
178 178
179 if (conf.defer_all) { /* I need this to debug delivery failures */ 179 if (conf.defer_all) {
180 /* I need this to debug delivery failures */
180 smtp_printf(out, "421 %s service temporarily unavailable.\r\n", conf.host_name); 181 smtp_printf(out, "421 %s service temporarily unavailable.\r\n", conf.host_name);
181 break; 182 destroy_message(msg);
183 msg = NULL;
184 return;
182 } 185 }
183 186
184 switch (cmd_id) { 187 switch (cmd_id) {
185 case SMTP_HELO: 188 case SMTP_HELO:
186 psc->prot = PROT_SMTP; 189 psc->prot = PROT_SMTP;