masqmail: src/deliver.c annotate

annotate src/deliver.c @ 319:d41fb3b9ed3e

refactoring in the small

author	meillo@marmaro.de
date	Thu, 28 Apr 2011 16:42:28 +0200
parents	55b7bde95d37
children	412385b57dc4

rev	line source
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	1 /* MasqMail
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	2 Copyright (C) 1999-2002 Oliver Kurth
224 996b53a50f55 added my copyright to files I worked on meillo@marmaro.de parents: 222 diff changeset	3 Copyright (C) 2008, 2010 markus schnalke <meillo@marmaro.de>
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	4
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	5 This program is free software; you can redistribute it and/or modify
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	6 it under the terms of the GNU General Public License as published by
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	7 the Free Software Foundation; either version 2 of the License, or
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	8 (at your option) any later version.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	9
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	10 This program is distributed in the hope that it will be useful,
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	13 GNU General Public License for more details.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	14
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	15 You should have received a copy of the GNU General Public License
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	16 along with this program; if not, write to the Free Software
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	18 */
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	19
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	20 #include <fnmatch.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	21 #include <sysexits.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	22 #include <netdb.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	23
15 f671821d8222 code beautifying; 0 -> \0 if appropriate meillo@marmaro.de parents: 12 diff changeset	24 #include "masqmail.h"
f671821d8222 code beautifying; 0 -> \0 if appropriate meillo@marmaro.de parents: 12 diff changeset	25 #include "smtp_out.h"
f671821d8222 code beautifying; 0 -> \0 if appropriate meillo@marmaro.de parents: 12 diff changeset	26
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	27 /* collect failed/defered rcpts for failure/warning messages */
15 f671821d8222 code beautifying; 0 -> \0 if appropriate meillo@marmaro.de parents: 12 diff changeset	28 /* returns TRUE if either there are no failures or a failure message has been successfully sent */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	29 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	30 delivery_failures(message * msg, GList * rcpt_list, gchar * err_fmt, ...)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	31 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	32 gboolean ok_fail = TRUE, ok_warn = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	33 time_t now = time(NULL);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	34
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	35 GList failed_list = NULL, defered_list = NULL, *rcpt_node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	36 va_list args;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	37 va_start(args, err_fmt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	38
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	39 foreach(rcpt_list, rcpt_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	40 address rcpt = (address ) (rcpt_node->data);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	41
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	42 if (addr_is_defered(rcpt)) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	43 if ((now - msg->received_time) >= conf.max_defer_time) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	44 addr_mark_failed(rcpt);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	45 } else {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	46 defered_list = g_list_prepend(defered_list, rcpt);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	47 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	48 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	49 if (addr_is_failed(rcpt)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	50 failed_list = g_list_prepend(failed_list, rcpt);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	51 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	52 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	53 if (failed_list) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	54 ok_fail = fail_msg(msg, conf.errmsg_file, failed_list, err_fmt, args);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	55 g_list_free(failed_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	56 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	57 if (defered_list) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	58 ok_warn = warn_msg(msg, conf.warnmsg_file, defered_list, err_fmt, args);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	59 g_list_free(defered_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	60 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	61 va_end(args);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	62 return ok_fail && ok_warn;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	63 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	64
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	65 static gint
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	66 _g_list_strcasecmp(gconstpointer a, gconstpointer b)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	67 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	68 return (gint) strcasecmp(a, b);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	69 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	70
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	71 gboolean
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	72 deliver_local_mbox(message* msg, GList* hdr_list, address* rcpt, address* env_addr)
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	73 {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	74 DEBUG(1) debugf("attempting to deliver %s with mbox\n", msg->uid);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	75 if (append_file(msg, hdr_list, rcpt->local_part)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	76 if (env_addr != rcpt) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	77 logwrite(LOG_NOTICE, "%s => %s@%s <%s@%s> with mbox\n", msg->uid, rcpt->local_part, rcpt->domain, env_addr->local_part, env_addr->domain);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	78 } else {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	79 logwrite(LOG_NOTICE, "%s => <%s@%s> with mbox\n", msg->uid, rcpt->local_part, rcpt->domain);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	80 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	81 addr_mark_delivered(rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	82 return TRUE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	83 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	84
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	85 /* prevents 'Resource temporarily unavailable (11)' */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	86 if (errno != EAGAIN) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	87 addr_mark_failed(rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	88 } else {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	89 addr_mark_defered(rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	90 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	91 return FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	92 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	93
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	94 gboolean
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	95 deliver_local_pipe(message* msg, GList* hdr_list, address* rcpt, address* env_addr)
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	96 {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	97 guint flags;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	98
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	99 DEBUG(1) debugf("attempting to deliver %s with pipe\n", msg->uid);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	100
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	101 flags = (conf.pipe_fromline) ? MSGSTR_FROMLINE : 0;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	102 flags \|= (conf.pipe_fromhack) ? MSGSTR_FROMHACK : 0;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	103 if (pipe_out(msg, hdr_list, rcpt, &(rcpt->local_part[1]), flags)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	104 logwrite(LOG_NOTICE, "%s => %s <%s@%s> with pipe\n",
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	105 msg->uid, rcpt->local_part, env_addr->local_part, env_addr->domain);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	106 addr_mark_delivered(rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	107 return TRUE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	108 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	109
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	110 if ((errno != (1024 + EX_TEMPFAIL)) && (errno != EAGAIN)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	111 addr_mark_failed(rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	112 } else {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	113 addr_mark_defered(rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	114 /* has no effect yet, except that mail remains in spool */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	115 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	116 return FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	117 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	118
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	119 gboolean
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	120 deliver_local_mda(message* msg, GList* hdr_list, address* rcpt, address* env_addr)
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	121 {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	122 gboolean ok = FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	123 gchar *cmd = g_malloc(256);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	124 GList *var_table = var_table_rcpt(var_table_msg(NULL, msg), rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	125 guint flags;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	126
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	127 DEBUG(1) debugf("attempting to deliver %s with mda\n", msg->uid);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	128
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	129 if (!expand(var_table, conf.mda, cmd, 256)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	130 logwrite(LOG_ALERT, "could not expand string %s\n", conf.mda);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	131 destroy_table(var_table);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	132 return FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	133 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	134
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	135 flags = (conf.mda_fromline) ? MSGSTR_FROMLINE : 0;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	136 flags \|= (conf.mda_fromhack) ? MSGSTR_FROMHACK : 0;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	137 if (pipe_out(msg, hdr_list, rcpt, cmd, flags)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	138 logwrite(LOG_NOTICE, "%s => %s@%s with mda (cmd = '%s')\n",
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	139 msg->uid, rcpt->local_part, rcpt->domain, cmd);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	140 addr_mark_delivered(rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	141 ok = TRUE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	142 } else if ((errno != (1024 + EX_TEMPFAIL)) && (errno != EAGAIN)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	143 addr_mark_failed(rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	144 } else {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	145 addr_mark_defered(rcpt);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	146 /* has no effect yet, except that mail remains in spool */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	147 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	148
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	149 destroy_table(var_table);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	150 return ok;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	151 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	152
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	153 gboolean
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	154 deliver_local(msg_out * msgout)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	155 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	156 message *msg = msgout->msg;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	157 GList *rcpt_list = msgout->rcpt_list;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	158 GList *rcpt_node;
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	159 gboolean ok = FALSE, flag = FALSE, ok_fail = FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	160
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	161 DEBUG(5) debugf("deliver_local entered\n");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	162
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	163 flag = (msg->data_list == NULL);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	164 if (flag && !spool_read_data(msg)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	165 logwrite(LOG_ALERT, "could not open data spool file for %s\n", msg->uid);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	166 return FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	167 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	168
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	169 for (rcpt_node = g_list_first(rcpt_list); rcpt_node; rcpt_node = g_list_next(rcpt_node)) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	170 GList *hdr_list;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	171 address rcpt = (address ) (rcpt_node->data);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	172 address *env_addr = addr_find_ancestor(rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	173 address *ret_path = msg->return_path;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	174 header retpath_hdr, envto_hdr;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	175
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	176 /* we need a private copy of the hdr list because we add headers
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	177 here that belong to the rcpt only. g_list_copy copies only
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	178 the nodes, so it is safe to g_list_free it */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	179 hdr_list = g_list_copy(msg->hdr_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	180 retpath_hdr = create_header(HEAD_ENVELOPE_TO, "Envelope-to: %s\n", addr_string(env_addr));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	181 envto_hdr = create_header(HEAD_RETURN_PATH, "Return-path: %s\n", addr_string(ret_path));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	182
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	183 hdr_list = g_list_prepend(hdr_list, envto_hdr);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	184 hdr_list = g_list_prepend(hdr_list, retpath_hdr);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	185
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	186 if (rcpt->local_part[0] == '\|') {
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	187 /* probably for expanded aliases, but why not done
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	188 like with the mda? //meillo 2010-12-06 */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	189 if (deliver_local_pipe(msg, hdr_list, rcpt, env_addr)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	190 ok = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	191 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	192 } else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	193 /* figure out which mailbox type should be used for this user */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	194 gchar *user = rcpt->local_part;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	195 gchar *mbox_type = conf.mbox_default;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	196
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	197 if (g_list_find_custom (conf.mbox_users, user, _g_list_strcasecmp)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	198 mbox_type = "mbox";
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	199 } else if (g_list_find_custom (conf.mda_users, user, _g_list_strcasecmp)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	200 mbox_type = "mda";
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	201 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	202
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	203 if (strcmp(mbox_type, "mbox") == 0) {
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	204 if (deliver_local_mbox(msg, hdr_list, rcpt, env_addr)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	205 ok = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	206 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	207 } else if (strcmp(mbox_type, "mda") == 0) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	208 if (conf.mda) {
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	209 if (deliver_local_mda(msg, hdr_list, rcpt, env_addr)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	210 ok = TRUE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	211 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	212 } else {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	213 logwrite(LOG_ALERT, "mbox type is mda, but no mda command given in configuration\n");
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	214 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	215
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	216 } else {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	217 logwrite(LOG_ALERT, "unknown mbox type '%s'\n", mbox_type);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	218 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	219 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	220
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	221 destroy_header(retpath_hdr);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	222 destroy_header(envto_hdr);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	223
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	224 g_list_free(hdr_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	225 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	226 ok_fail = delivery_failures(msg, rcpt_list, "%s (%d)", ext_strerror(errno), errno);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	227
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	228 if (flag) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	229 msg_free_data(msg);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	230 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	231 if (ok \|\| ok_fail) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	232 deliver_finish(msgout);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	233 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	234
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	235 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	236 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	237
315 c98aa884d2cb added comments meillo@marmaro.de parents: 311 diff changeset	238 /* make a list of rcpt's of a message that are local
c98aa884d2cb added comments meillo@marmaro.de parents: 311 diff changeset	239 return a new copy of the list */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	240 void
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	241 msg_rcptlist_local(GList * rcpt_list, GList p_local_list, GList p_nonlocal_list)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	242 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	243 GList *rcpt_node;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	244
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	245 foreach(rcpt_list, rcpt_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	246 address rcpt = (address ) (rcpt_node->data);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	247 GList *dom_node;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	248
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	249 DEBUG(5) debugf("checking address %s\n", rcpt->address);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	250
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	251 /* search for local host list: */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	252 foreach(conf.local_hosts, dom_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	253 if (strcasecmp(dom_node->data, rcpt->domain) == 0) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	254 p_local_list = g_list_append(p_local_list, rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	255 DEBUG(5) debugf("<%s@%s> is local\n", rcpt->local_part, rcpt->domain);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	256 break;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	257 } else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	258 p_nonlocal_list = g_list_append(p_nonlocal_list, rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	259 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	260 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	261 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	262 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	263
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	264 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	265 deliver_msglist_host_pipe(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	266 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	267 gboolean ok = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	268 GList *msgout_node;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	269
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	270 DEBUG(5) debugf("deliver_msglist_host_pipe entered\n");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	271
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	272 foreach(msgout_list, msgout_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	273 msg_out msgout = (msg_out ) (msgout_node->data);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	274 gboolean flag, ok_fail = FALSE;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	275 message *msg = msgout->msg;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	276 GList rcpt_node, rcpt_list = msgout->rcpt_list;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	277
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	278 DEBUG(1) debugf("attempting to deliver %s with pipe\n", msg->uid);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	279
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	280 flag = (msg->data_list == NULL);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	281 if (flag && !spool_read_data(msg)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	282 logwrite(LOG_ALERT, "could not open data spool file for %s\n", msg->uid);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	283 continue;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	284 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	285
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	286 ok = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	287 foreach(rcpt_list, rcpt_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	288 address rcpt = (address ) (rcpt_node->data);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	289 gchar *cmd = g_malloc(256);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	290 GList *var_table = var_table_rcpt(var_table_msg(NULL, msg), rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	291
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	292 DEBUG(1) debugf("attempting to deliver %s to %s@%s with pipe\n", msg->uid, rcpt->local_part, rcpt->domain);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	293
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	294 if (!expand(var_table, route->pipe, cmd, 256)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	295 logwrite(LOG_ALERT, "could not expand string %s\n", route->pipe);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	296 } else {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	297
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	298 if (pipe_out(msg, msg->hdr_list, rcpt, cmd, (route->pipe_fromline ? MSGSTR_FROMLINE : 0)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	299 \| (route->pipe_fromhack ? MSGSTR_FROMHACK : 0))) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	300 logwrite(LOG_NOTICE, "%s => %s@%s with pipe (cmd = '%s')\n",
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	301 msg->uid, rcpt->local_part, rcpt->domain, cmd);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	302 addr_mark_delivered(rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	303 ok = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	304 } else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	305 logwrite(LOG_ALERT, "pipe_out '%s' failed\n", route->pipe);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	306
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	307 if (route->connect_error_fail) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	308 addr_mark_failed(rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	309 } else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	310 addr_mark_defered(rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	311 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	312 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	313 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	314
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	315 destroy_table(var_table);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	316 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	317 ok_fail = delivery_failures(msg, rcpt_list, "%s", strerror(errno));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	318
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	319 if (flag) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	320 msg_free_data(msg);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	321 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	322 if (ok \|\| ok_fail) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	323 deliver_finish(msgout);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	324 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	325 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	326
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	327 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	328 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	329
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	330 /* deliver list of messages to one host and finishes them if the message was
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	331 delivered to at least one rcpt.
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	332 Returns TRUE if at least one msg was delivered to at least one rcpt.
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	333 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	334 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	335 deliver_msglist_host_smtp(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	336 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	337 gboolean ok = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	338 GList *msgout_node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	339 smtp_base *psb;
178 91f8ee6514f5 removed `remote_port' config option meillo@marmaro.de parents: 114 diff changeset	340 gint port = 25;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	341
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	342 /* paranoid check: */
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	343 if (!msgout_list) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	344 logwrite(LOG_ALERT, "Ooops: empty list of messages in deliver_msglist_host()\n");
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	345 return FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	346 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	347
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	348 if (!host) {
179 3190e6864452 added comments to deliver.c (stuff to check) meillo@marmaro.de parents: 178 diff changeset	349 /* XXX: what if mail_host isn't set? Is this possible? */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	350 host = route->mail_host->address;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	351 port = route->mail_host->port;
178 91f8ee6514f5 removed `remote_port' config option meillo@marmaro.de parents: 114 diff changeset	352 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	353
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	354 if (route->wrapper) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	355 psb = smtp_out_open_child(route->wrapper);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	356 } else {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	357 psb = smtp_out_open(host, port, res_list);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	358 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	359
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	360 if (!psb) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	361 /* smtp_out_open() failed */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	362 foreach(msgout_list, msgout_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	363 msg_out msgout = (msg_out ) (msgout_node->data);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	364 GList *rcpt_node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	365
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	366 for (rcpt_node = g_list_first(msgout->rcpt_list);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	367 rcpt_node;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	368 rcpt_node = g_list_next(rcpt_node)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	369 address rcpt = (address ) (rcpt_node->data);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	370 gboolean ret = FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	371
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	372 addr_unmark_delivered(rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	373 if (route->connect_error_fail) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	374 addr_mark_failed(rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	375 } else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	376 addr_mark_defered(rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	377 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	378 if (route->wrapper) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	379 ret = delivery_failures(msgout->msg, msgout->rcpt_list, "could not open wrapper:\n\t%s", strerror(errno));
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	380 } else {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	381 ret = delivery_failures(msgout->msg, msgout->rcpt_list, "could not open connection to %s:%d :\n\t%s", host, port, h_errno != 0 ? hstrerror(h_errno) : strerror(errno));
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	382 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	383 if (ret) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	384 deliver_finish(msgout);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	385 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	386 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	387 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	388 return ok;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	389 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	390
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	391
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	392 if (route->wrapper) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	393 /* it seems as if the remote_host is only set for logging
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	394 /* XXX: this could probably be moved into smtp_out_open_child() */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	395 psb->remote_host = host;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	396 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	397
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	398 set_heloname(psb, route->helo_name ? route->helo_name : conf.host_name, route->do_correct_helo);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	399
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	400 #ifdef ENABLE_AUTH
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	401 if ((route->auth_name) && (route->auth_login) && (route->auth_secret)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	402 set_auth(psb, route->auth_name, route->auth_login, route->auth_secret);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	403 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	404 #endif
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	405 if (!smtp_out_init(psb, route->instant_helo)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	406 /* smtp_out_init() failed */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	407 if ((psb->error==smtp_fail) \|\| (psb->error==smtp_trylater) \|\| (psb->error==smtp_syntax)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	408 smtp_out_quit(psb);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	409
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	410 foreach(msgout_list, msgout_node) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	411 msg_out msgout = (msg_out ) (msgout_node->data);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	412 smtp_out_mark_rcpts(psb, msgout->rcpt_list);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	413
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	414 if (delivery_failures(msgout->msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", host, psb->buffer)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	415 deliver_finish(msgout);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	416 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	417 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	418 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	419 destroy_smtpbase(psb);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	420 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	421 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	422
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	423 if (!route->do_pipelining) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	424 psb->use_pipelining = FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	425 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	426
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	427 foreach(msgout_list, msgout_node) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	428 msg_out msgout = (msg_out ) (msgout_node->data);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	429 gboolean flag, ok_msg = FALSE, ok_fail = FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	430 message *msg = msgout->msg;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	431
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	432 /* we may have to read the data at this point and remember if we did */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	433 flag = (msg->data_list == NULL);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	434 if (flag && !spool_read_data(msg)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	435 logwrite(LOG_ALERT, "could not open data spool file %s\n", msg->uid);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	436 break;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	437 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	438
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	439 smtp_out_msg(psb, msg, msgout->return_path, msgout->rcpt_list, msgout->hdr_list);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	440
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	441 ok_fail = delivery_failures(msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", host, psb->buffer);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	442
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	443 if ((psb->error == smtp_eof) \|\| (psb->error == smtp_timeout)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	444 /* connection lost */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	445 break;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	446 } else if (psb->error != smtp_ok) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	447 if (g_list_next(msgout_node) && !smtp_out_rset(psb)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	448 break;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	449 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	450 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	451 ok_msg = (psb->error == smtp_ok);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	452
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	453 if (flag) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	454 msg_free_data(msg);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	455 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	456 if (ok_msg) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	457 ok = TRUE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	458 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	459 if (ok_msg \|\| ok_fail) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	460 deliver_finish(msgout);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	461 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	462 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	463 if (psb->error == smtp_ok \|\| (psb->error == smtp_fail)
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	464 \|\| (psb->error == smtp_trylater) \|\| (psb->error == smtp_syntax)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	465 smtp_out_quit(psb);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	466 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	467 destroy_smtpbase(psb);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	468 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	469 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	470
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	471 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	472 deliver_msglist_host(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	473 {
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	474
311 e230bcd0f1c6 removed protocol option from route config meillo@marmaro.de parents: 310 diff changeset	475 if (route->pipe) {
e230bcd0f1c6 removed protocol option from route config meillo@marmaro.de parents: 310 diff changeset	476 DEBUG(5) debugf("with pipe\n");
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	477 return deliver_msglist_host_pipe(route, msgout_list, host, res_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	478 } else {
311 e230bcd0f1c6 removed protocol option from route config meillo@marmaro.de parents: 310 diff changeset	479 DEBUG(5) debugf("with smtp\n");
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	480 return deliver_msglist_host_smtp(route, msgout_list, host, res_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	481 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	482 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	483
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	484 /*
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	485 delivers messages in msgout_list using route
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	486 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	487 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	488 deliver_route_msgout_list(connect_route * route, GList * msgout_list)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	489 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	490 gboolean ok = FALSE;
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	491 GList *mo_ph_list;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	492 GList *mo_ph_node;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	493
15 f671821d8222 code beautifying; 0 -> \0 if appropriate meillo@marmaro.de parents: 12 diff changeset	494 DEBUG(5) debugf("deliver_route_msgout_list entered, route->name = %s\n", route->name);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	495
179 3190e6864452 added comments to deliver.c (stuff to check) meillo@marmaro.de parents: 178 diff changeset	496 if (route->mail_host) {
3190e6864452 added comments to deliver.c (stuff to check) meillo@marmaro.de parents: 178 diff changeset	497 /* this is easy... deliver everything to a smart host for relay */
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	498 return deliver_msglist_host(route, msgout_list, NULL, route->resolve_list);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	499 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	500
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	501 /* this is not easy... */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	502
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	503 mo_ph_list = route_msgout_list(route, msgout_list);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	504 /* okay, now we have ordered our messages by the hosts. */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	505 if (!mo_ph_list) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	506 return FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	507 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	508
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	509 /* TODO: It would be nice to be able to fork for each host.
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	510 We cannot do that yet because of complications with finishing the
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	511 messages. Threads could be a solution because they use the same
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	512 memory. But we are not thread safe yet...
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	513 */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	514 foreach(mo_ph_list, mo_ph_node) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	515 msgout_perhost mo_ph = (msgout_perhost ) (mo_ph_node->data);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	516 if (deliver_msglist_host(route, mo_ph->msgout_list, mo_ph->host, route->resolve_list)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	517 ok = TRUE;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	518 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	519 destroy_msgout_perhost(mo_ph);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	520 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	521 g_list_free(mo_ph_list);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	522 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	523 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	524
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	525 /*
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	526 calls route_prepare_msg()
15 f671821d8222 code beautifying; 0 -> \0 if appropriate meillo@marmaro.de parents: 12 diff changeset	527 delivers messages in msg_list using route by calling deliver_route_msgout_list()
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	528 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	529 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	530 deliver_route_msg_list(connect_route * route, GList * msgout_list)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	531 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	532 GList *msgout_list_deliver = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	533 GList *msgout_node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	534 gboolean ok = TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	535
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	536 DEBUG(6) debugf("deliver_route_msg_list()\n");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	537
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	538 foreach(msgout_list, msgout_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	539 msg_out msgout = (msg_out ) (msgout_node->data);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	540 msg_out *msgout_cloned = clone_msg_out(msgout);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	541 GList *rcpt_list_non_delivered = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	542 GList *rcpt_node;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	543
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	544 /* we have to delete already delivered rcpt's because a
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	545 previous route may have delivered to it */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	546 foreach(msgout_cloned->rcpt_list, rcpt_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	547 address rcpt = (address ) (rcpt_node->data);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	548 /* failed addresses already have been bounced;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	549 there should be a better way to handle those. */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	550 if (!addr_is_delivered(rcpt) && !addr_is_failed(rcpt)
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	551 && !(rcpt->flags & ADDR_FLAG_LAST_ROUTE)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	552 rcpt_list_non_delivered = g_list_append(rcpt_list_non_delivered, rcpt);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	553 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	554 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	555 g_list_free(msgout_cloned->rcpt_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	556 msgout_cloned->rcpt_list = rcpt_list_non_delivered;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	557
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	558 if (!msgout_cloned->rcpt_list) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	559 destroy_msg_out(msgout_cloned);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	560 continue;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	561 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	562
317 55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 315 diff changeset	563 /* filter by allowed envelope sender */
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 315 diff changeset	564 if (!route_sender_is_allowed(route, msgout->msg->return_path)) {
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	565 destroy_msg_out(msgout_cloned);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	566 continue;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	567 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	568
317 55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 315 diff changeset	569 /* filter by allowed envelope rcpts */
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 315 diff changeset	570 GList* rcpt_list_allowed = NULL;
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 315 diff changeset	571 GList* rcpt_list_notallowed = NULL;
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 315 diff changeset	572 route_split_rcpts(route, msgout_cloned->rcpt_list, &rcpt_list_allowed, &rcpt_list_notallowed);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	573 if (!rcpt_list_allowed) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	574 destroy_msg_out(msgout_cloned);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	575 continue;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	576 }
317 55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 315 diff changeset	577
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	578 logwrite(LOG_NOTICE, "%s using '%s'\n", msgout->msg->uid, route->name);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	579
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	580 g_list_free(msgout_cloned->rcpt_list);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	581 msgout_cloned->rcpt_list = rcpt_list_allowed;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	582
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	583 if (route->last_route) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	584 GList *rcpt_node;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	585 foreach(msgout_cloned->rcpt_list, rcpt_node) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	586 address rcpt = (address ) (rcpt_node->data);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	587 rcpt->flags \|= ADDR_FLAG_LAST_ROUTE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	588 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	589 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	590
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	591 route_prepare_msgout(route, msgout_cloned);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	592 msgout_list_deliver = g_list_append(msgout_list_deliver, msgout_cloned);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	593 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	594
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	595 if (msgout_list_deliver) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	596 if (deliver_route_msgout_list(route, msgout_list_deliver)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	597 ok = TRUE;
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	598 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	599 destroy_msg_out_list(msgout_list_deliver);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	600 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	601 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	602 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	603
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	604 /* copy pointers of delivered addresses to the msg's non_rcpt_list,
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	605 to make sure that they will not be delivered again.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	606 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	607 void
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	608 update_non_rcpt_list(msg_out * msgout)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	609 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	610 GList *rcpt_node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	611 message *msg = msgout->msg;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	612
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	613 foreach(msgout->rcpt_list, rcpt_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	614 address rcpt = (address ) (rcpt_node->data);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	615 if (addr_is_delivered(rcpt) \|\| addr_is_failed(rcpt)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	616 msg->non_rcpt_list = g_list_append(msg->non_rcpt_list, rcpt);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	617 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	618 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	619 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	620
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	621 /* after delivery attempts, we check if there are any rcpt addresses left in
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	622 the message. If all addresses have been completed, the spool files will be
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	623 deleted, otherwise the header spool will be written back. We never changed
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	624 the data spool, so there is no need to write that back.
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	625
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	626 returns TRUE if all went well.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	627 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	628 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	629 deliver_finish(msg_out * msgout)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	630 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	631 GList *rcpt_node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	632 message *msg = msgout->msg;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	633 gboolean finished = TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	634
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	635 update_non_rcpt_list(msgout);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	636
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	637 /* we NEVER made copies of the addresses, flags affecting addresses
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	638 were always set on the original address structs */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	639 foreach(msg->rcpt_list, rcpt_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	640 address rcpt = (address ) (rcpt_node->data);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	641 if (!addr_is_finished_children(rcpt)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	642 finished = FALSE;
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	643 } else {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	644 /* if ALL children have been delivered, mark parent as
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	645 delivered. if there is one or more not delivered,
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	646 it must have failed, we mark the parent as failed
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	647 as well.
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	648 */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	649 if (addr_is_delivered_children(rcpt)) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	650 addr_mark_delivered(rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	651 } else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	652 addr_mark_failed(rcpt);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	653 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	654 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	655 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	656
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	657 if (finished) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	658 if (spool_delete_all(msg)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	659 logwrite(LOG_NOTICE, "%s completed.\n", msg->uid);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	660 return TRUE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	661 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	662 return FALSE;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	663 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	664
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	665 /* one not delivered address was found */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	666 if (!spool_write(msg, FALSE)) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	667 logwrite(LOG_ALERT, "could not write back spool header for %s\n", msg->uid);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	668 return FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	669 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	670
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	671 DEBUG(2) debugf("spool header for %s written back.\n", msg->uid);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	672 return TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	673 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	674
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	675 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	676 deliver_finish_list(GList * msgout_list)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	677 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	678 gboolean ok = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	679 GList *msgout_node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	680 foreach(msgout_list, msgout_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	681 msg_out msgout = (msg_out ) (msgout_node->data);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	682 if (!deliver_finish(msgout)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	683 ok = FALSE;
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	684 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	685 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	686 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	687 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	688
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	689 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	690 deliver_msgout_list_online(GList * msgout_list)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	691 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	692 GList *rf_list = NULL;
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	693 gchar *connect_name = NULL;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	694 gboolean ok = FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	695
310 f10a56dc7481 reworked online_detect to the simpler online_query meillo@marmaro.de parents: 280 diff changeset	696 connect_name = online_query();
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	697 if (!connect_name) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	698 return FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	699 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	700
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	701 /* we are online! */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	702 logwrite(LOG_NOTICE, "detected online configuration %s\n", connect_name);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	703
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	704 rf_list = (GList *) table_find(conf.connect_routes, connect_name);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	705 if (!rf_list) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	706 logwrite(LOG_ALERT, "route list with name '%s' not found.\n", connect_name);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	707 return FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	708 }
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	709
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	710 GList *route_list = read_route_list(rf_list, FALSE);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	711 if (!route_list) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	712 logwrite(LOG_ALERT, "could not read route list '%s'\n", connect_name);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	713 return FALSE;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	714 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	715
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	716 GList *route_node;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	717 foreach(route_list, route_node) {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	718 connect_route route = (connect_route ) (route_node->data);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	719 /* TODO: ok gets overwritten */
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	720 ok = deliver_route_msg_list(route, msgout_list);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	721 }
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	722 destroy_route_list(route_list);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	723 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	724 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	725
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	726 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	727 deliver_msg_list(GList * msg_list, guint flags)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	728 {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	729 GList *msgout_list = create_msg_out_list(msg_list);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	730 GList *local_msgout_list = NULL;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	731 GList *localnet_msgout_list = NULL;
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	732 GList *other_msgout_list = NULL;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	733 GList *msgout_node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	734 GList *alias_table = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	735 gboolean ok = TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	736
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	737 if (conf.alias_file) {
17 6c59dedd06be fixed delivery with empty or non-existent alias file meillo@marmaro.de parents: 15 diff changeset	738 alias_table = table_read(conf.alias_file, ':');
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	739 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	740
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	741 /* sort messages for different deliveries */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	742 foreach(msgout_list, msgout_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	743 msg_out msgout = (msg_out ) (msgout_node->data);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	744 GList *rcpt_list;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	745 GList *local_rcpt_list = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	746 GList *localnet_rcpt_list = NULL;
237 5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	747 GList *other_rcpt_list = NULL;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	748
114 a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	749 if (!spool_lock(msgout->msg->uid)) {
a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	750 DEBUG(5) debugf("spool_lock(%s) failed.\n", msgout->msg->uid);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	751 continue;
114 a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	752 }
a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	753 DEBUG(5) debugf("spool_lock(%s)\n", msgout->msg->uid);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	754
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	755 rcpt_list = g_list_copy(msgout->msg->rcpt_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	756 if (conf.log_user) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	757 address *addr = create_address_qualified(conf.log_user, TRUE, conf.host_name);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	758 if (addr) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	759 rcpt_list = g_list_prepend(rcpt_list, addr);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	760 } else {
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	761 logwrite(LOG_ALERT, "invalid log_user address `%s', ignoring\n", conf.log_user);
72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	762 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	763 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	764 if (alias_table) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	765 GList *aliased_rcpt_list;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	766 aliased_rcpt_list = alias_expand(alias_table, rcpt_list, msgout->msg->non_rcpt_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	767 g_list_free(rcpt_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	768 rcpt_list = aliased_rcpt_list;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	769 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	770
237 5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	771 split_rcpts(rcpt_list, conf.local_nets, &local_rcpt_list, &localnet_rcpt_list, &other_rcpt_list);
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	772 g_list_free(rcpt_list);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	773
237 5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	774 /* local recipients */
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	775 if ((flags & DLVR_LOCAL) && local_rcpt_list) {
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	776 msg_out *local_msgout = clone_msg_out(msgout);
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	777 local_msgout->rcpt_list = local_rcpt_list;
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	778 local_msgout_list = g_list_append(local_msgout_list, local_msgout);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	779 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	780
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	781 /* local net recipients */
237 5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	782 if ((flags & DLVR_LAN) && localnet_rcpt_list) {
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	783 msg_out *localnet_msgout = clone_msg_out(msgout);
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	784 localnet_msgout->rcpt_list = localnet_rcpt_list;
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	785 localnet_msgout_list = g_list_append(localnet_msgout_list, localnet_msgout);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	786 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	787
237 5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	788 /* remote recipients (the rest), requires online delivery */
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	789 if ((flags & DLVR_ONLINE) && other_rcpt_list) {
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	790 msg_out *other_msgout = clone_msg_out(msgout);
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	791 other_msgout->rcpt_list = other_rcpt_list;
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	792 other_msgout_list = g_list_append(other_msgout_list, other_msgout);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	793 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	794 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	795
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	796 if (alias_table) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	797 destroy_table(alias_table);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	798 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	799
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	800 /* actual delivery */
237 5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	801
5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	802 if (local_msgout_list) {
114 a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	803 DEBUG(5) debugf("local_msgout_list\n");
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	804 foreach(local_msgout_list, msgout_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	805 msg_out msgout = (msg_out ) (msgout_node->data);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	806 if (!deliver_local(msgout)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	807 ok = FALSE;
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	808 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	809 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	810 destroy_msg_out_list(local_msgout_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	811 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	812
237 5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	813 if (localnet_msgout_list) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	814 GList *route_list = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	815 GList *route_node;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	816
114 a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	817 DEBUG(5) debugf("localnet_msgout_list\n");
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	818 if (conf.local_net_routes) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	819 route_list = read_route_list(conf.local_net_routes, TRUE);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	820 } else {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	821 route_list = g_list_append(NULL, create_local_route());
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	822 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	823
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	824 foreach(route_list, route_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	825 connect_route route = (connect_route ) (route_node->data);
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	826 if (!deliver_route_msg_list(route, localnet_msgout_list)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	827 ok = FALSE;
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	828 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	829 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	830 destroy_msg_out_list(localnet_msgout_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	831 destroy_route_list(route_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	832 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	833
237 5f9f3a65032e refactoring: new function split_rcpts() replaces two others markus schnalke <meillo@marmaro.de> parents: 224 diff changeset	834 if (other_msgout_list) {
114 a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	835 DEBUG(5) debugf("other_msgout_list\n");
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	836 if (!deliver_msgout_list_online(other_msgout_list)) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	837 ok = FALSE;
280 72e377210d5e heavy refactoring of deliver.c markus schnalke <meillo@marmaro.de> parents: 237 diff changeset	838 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	839 destroy_msg_out_list(other_msgout_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	840 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	841
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	842 foreach(msgout_list, msgout_node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	843 msg_out msgout = (msg_out ) (msgout_node->data);
114 a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	844 if (spool_unlock(msgout->msg->uid)) {
a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	845 DEBUG(5) debugf("spool_unlock(%s)\n", msgout->msg->uid);
a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	846 } else {
a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	847 DEBUG(5) debugf("spool_unlock(%s) failed.\n", msgout->msg->uid);
a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	848 }
a80ebfa16cd5 better debugging output (thanks to Paolo) meillo@marmaro.de parents: 76 diff changeset	849
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	850 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	851
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	852 destroy_msg_out_list(msgout_list);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	853
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	854 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	855 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	856
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	857 /* This function searches in the list of rcpt addresses
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	858 for local and 'local net' addresses. Remote addresses
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	859 which are reachable only when online are treated specially
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	860 in another function.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	861
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	862 deliver() is called when a message has just been received and should
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	863 be delivered immediately.
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	864 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	865 gboolean
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	866 deliver(message * msg)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	867 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	868 gboolean ok;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	869 GList *msg_list = g_list_append(NULL, msg);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	870
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	871 ok = deliver_msg_list(msg_list, DLVR_ALL);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	872 g_list_free(msg_list);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	873
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	874 return ok;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	875 }

Mercurial > masqmail

annotate src/deliver.c @ 319:d41fb3b9ed3e