Mercurial > masqmail

comparison src/deliver.c @ 178:91f8ee6514f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed `remote_port' config option it was already deprecated for some time see NEWS at release 0.2.12 for details
author meillo@marmaro.de
date Wed, 14 Jul 2010 16:48:45 +0200
parents a80ebfa16cd5
children 3190e6864452
comparison
equal deleted inserted replaced
177:6530806d418f 178:91f8ee6514f5
319 deliver_msglist_host_smtp(connect_route * route, GList * msgout_list, gchar * host, GList * res_list) 319 deliver_msglist_host_smtp(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
320 { 320 {
321 gboolean ok = FALSE; 321 gboolean ok = FALSE;
322 GList *msgout_node; 322 GList *msgout_node;
323 smtp_base *psb; 323 smtp_base *psb;
324 gint port; 324 gint port = 25;
325 325
326 /* paranoid check: */ 326 /* paranoid check: */
327 if (msgout_list == NULL) { 327 if (msgout_list == NULL) {
328 logwrite(LOG_ALERT, "Ooops: empty list of messages in deliver_msglist_host()\n"); 328 logwrite(LOG_ALERT, "Ooops: empty list of messages in deliver_msglist_host()\n");
329 return FALSE; 329 return FALSE;
330 } 330 }
331 331
332 if (host == NULL) { 332 if (host == NULL) {
333 host = route->mail_host->address; 333 host = route->mail_host->address;
334 port = route->mail_host->port; 334 port = route->mail_host->port;
335 } else 335 }
336 port = conf.remote_port;
337 336
338 #ifdef ENABLE_POP3 337 #ifdef ENABLE_POP3
339 if (route->pop3_login) { 338 if (route->pop3_login) {
340 if (!(pop_before_smtp(route->pop3_login))) 339 if (!(pop_before_smtp(route->pop3_login)))
341 return FALSE; 340 return FALSE;