Mercurial > masqmail
changeset 367:b27f66555ba8
Reformated multiline comments to have leading asterisks on each line
Now we use:
/*
** comment
*/
This makes the indent style simpler, too.
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Thu, 20 Oct 2011 10:20:59 +0200 |
| parents | 41958685480d |
| children | b35c17fcf69d |
| files | src/accept.c src/address.c src/alias.c src/base64/base64.c src/base64/base64.h src/child.c src/conf.c src/connect.c src/deliver.c src/dotlock.c src/dotlock.h src/expand.c src/fail_msg.c src/header.c src/interface.c src/listen.c src/local.c src/log.c src/lookup.c src/lookup.h src/masqmail.c src/masqmail.h src/md5/hmac_md5.c src/md5/hmactest.c src/message.c src/mservdetect.c src/online.c src/parse.c src/peopen.c src/permissions.c src/queue.c src/readsock.c src/readsock.h src/readtest.c src/resolvtest.c src/rewrite.c src/route.c src/smtp_in.c src/smtp_out.c src/smtp_out.h src/smtpsend.c src/spool.c src/tables.c src/timeival.c |
| diffstat | 44 files changed, 1177 insertions(+), 1019 deletions(-) [+] |
line wrap: on
line diff
--- a/src/accept.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/accept.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "masqmail.h" @@ -54,11 +55,12 @@ return ret; } -/* accept message from anywhere. - A message from local is indicated by msg->recieved_host == NULL - - The -t option: With the ACC_RCPT_FROM_HEAD flag the addrs found found - in To/Cc/Bcc headers are added to the recipient list. +/* +** accept message from anywhere. +** A message from local is indicated by msg->recieved_host == NULL +** +** The -t option: With the ACC_RCPT_FROM_HEAD flag the addrs found found +** in To/Cc/Bcc headers are added to the recipient list. */ accept_error @@ -146,9 +148,14 @@ if ((hdr = get_header(line1))) { msg->hdr_list = g_list_append(msg->hdr_list, hdr); } else { - /* if get_header() returns NULL, no header was recognized, - so this seems to be the first data line of a broken mailer - which does not send an empty line after the headers */ + /* + ** if get_header() returns NULL, + ** no header was recognized, + ** so this seems to be the first + ** data line of a broken mailer + ** which does not send an empty + ** line after the headers + */ in_headers = FALSE; msg->data_list = g_list_prepend(msg->data_list, g_strdup(line1)); } @@ -290,10 +297,12 @@ } if (!msg->return_path) { - /* TODO: do we still need this as we don't fetch - mail anymore? */ - /* this can happen for pop3 accept only and if no - Return-Path: header was given */ + /* + ** TODO: do we still need this as we don't fetch + ** mail anymore? + ** This can happen for pop3 accept only and if no + ** Return-Path: header was given + */ GList *hdr_list; header *hdr;
--- a/src/address.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/address.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "masqmail.h"
--- a/src/alias.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/alias.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 2000-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 2000-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "masqmail.h" @@ -104,7 +105,7 @@ } /* -addr is assumed to be local and no pipe address nor not-to-expand +** addr is assumed to be local and no pipe address nor not-to-expand */ static GList* expand_one(GList *alias_table, address *addr) @@ -120,8 +121,10 @@ DEBUG(6) debugf("alias: '%s' is local and will get expanded\n", addr->local_part); if (strcasecmp(addr->local_part, "postmaster") == 0) { - /* postmaster must always be matched caseless - see RFC 822 and RFC 5321 */ + /* + ** postmaster must always be matched caseless + ** see RFC 822 and RFC 5321 + */ val = (gchar *) table_find_func(alias_table, addr->local_part, strcasecmp); } else { val = (gchar *) table_find_func(alias_table, addr->local_part, conf.localpartcmp); @@ -241,8 +244,11 @@ if (addr_isequal(addr, non_addr, conf.localpartcmp)) { done_list = g_list_remove_link(done_list, rcpt_node); g_list_free_1(rcpt_node); - /* this address is still in the children lists - of the original address, simply mark them delivered */ + /* + ** this address is still in the children + ** lists of the original address, simply + ** mark them delivered + */ addr_mark_delivered(addr); break; }
--- a/src/base64/base64.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/base64/base64.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,21 @@ -/* base64.c, Copyright 2000 (C) Oliver Kurth, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* +** base64.c +** Copyright 2000 (C) Oliver Kurth, +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ /* see also RFC 1341 */
--- a/src/base64/base64.h Thu Sep 22 15:07:40 2011 +0200 +++ b/src/base64/base64.h Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,21 @@ -/* base64.h, Copyright 2000 (C) Oliver Kurth, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* +** base64.h +** Copyright 2000 (C) Oliver Kurth, +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ gchar *base64_encode(guchar *buf, gint len); gchar *base64_decode(gchar *buf, gint *size);
--- a/src/child.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/child.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,21 @@ -/* child.c, Copyright (C) 2000 by Oliver Kurth, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* +** child.c +** Copyright (C) 2000 by Oliver Kurth, +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ #include <errno.h> #include <stdio.h>
--- a/src/conf.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/conf.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <pwd.h> @@ -142,11 +143,12 @@ return list; } -/* Split the addrs at '@' into local_part and domain. Without an '@' - everything is local_part. Create address structs, which are put - into a list and returned. - This funktion is used for lists of addrs containing globbing chars (* and ?). - We don't need valid RFC821 addresses here, just patterns to match against. +/* +** Split the addrs at '@' into local_part and domain. Without an '@' +** everything is local_part. Create address structs, which are put into a +** list and returned. This funktion is used for lists of addrs containing +** globbing chars (* and ?). We don't need valid RFC821 addresses here, +** just patterns to match against. */ static GList* parse_address_glob_list(gchar *line, gboolean read_file)
--- a/src/connect.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/connect.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 1999 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "masqmail.h" @@ -76,15 +77,15 @@ return NULL; } -/* Given a list of resolver functions, this function - resolve the host and tries to connect to the addresses - returned. If a connection attemp is timed out or refused, - the next address is tried. - - TODO: the resolver functions might return duplicate addresses, - if attempt failed for one it should not be tried again. +/* +** Given a list of resolver functions, this function +** resolve the host and tries to connect to the addresses +** returned. If a connection attemp is timed out or refused, +** the next address is tried. +** +** TODO: the resolver functions might return duplicate addresses, +** if attempt failed for one it should not be tried again. */ - mxip_addr* connect_resolvelist(int *psockfd, gchar *host, guint port, GList *res_func_list) { @@ -104,8 +105,11 @@ g_list_free(addr_list); return addr; } - /* previous versions complained, until someone tried to use a hostname - out there that begins with a digit. eg. '3dwars.de'. */ + /* + ** previous versions complained, until someone tried + ** to use a hostname out there that begins with a + ** digit. eg. '3dwars.de'. + */ } if (res_func_list == NULL) {
--- a/src/deliver.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/deliver.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2002 Oliver Kurth - Copyright (C) 2008, 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2002 Oliver Kurth +** Copyright (C) 2008, 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <fnmatch.h> @@ -24,8 +25,11 @@ #include "masqmail.h" #include "smtp_out.h" -/* collect failed/defered rcpts for failure/warning messages */ -/* returns TRUE if either there are no failures or a failure message has been successfully sent */ +/* +** collect failed/defered rcpts for failure/warning messages +** returns TRUE if either there are no failures or a failure message has +** been successfully sent +*/ gboolean delivery_failures(message *msg, GList *rcpt_list, gchar *err_fmt, ...) { @@ -173,9 +177,11 @@ address *ret_path = msg->return_path; header *retpath_hdr, *envto_hdr; - /* we need a private copy of the hdr list because we add headers - here that belong to the rcpt only. g_list_copy copies only - the nodes, so it is safe to g_list_free it */ + /* + ** we need a private copy of the hdr list because we add + ** headers here that belong to the rcpt only. g_list_copy + ** copies only the nodes, so it is safe to g_list_free it + */ hdr_list = g_list_copy(msg->hdr_list); retpath_hdr = create_header(HEAD_ENVELOPE_TO, "Envelope-to: %s\n", addr_string(env_addr)); envto_hdr = create_header(HEAD_RETURN_PATH, "Return-path: %s\n", addr_string(ret_path)); @@ -184,8 +190,10 @@ hdr_list = g_list_prepend(hdr_list, retpath_hdr); if (rcpt->local_part[0] == '|') { - /* probably for expanded aliases, but why not done - like with the mda? //meillo 2010-12-06 */ + /* + ** probably for expanded aliases, but why not done + ** like with the mda? //meillo 2010-12-06 + */ if (deliver_local_pipe(msg, hdr_list, rcpt, env_addr)) { ok = TRUE; } @@ -235,10 +243,13 @@ return ok; } -/* make a list of rcpt's of a message that are local - return a new copy of the list */ +/* +** make a list of rcpt's of a message that are local +** return a new copy of the list +*/ void -msg_rcptlist_local(GList *rcpt_list, GList **p_local_list, GList **p_nonlocal_list) +msg_rcptlist_local(GList *rcpt_list, GList **p_local_list, + GList **p_nonlocal_list) { GList *rcpt_node; @@ -329,12 +340,14 @@ return ok; } -/* deliver list of messages to one host and finishes them if the message was - delivered to at least one rcpt. - Returns TRUE if at least one msg was delivered to at least one rcpt. +/* +** deliver list of messages to one host and finishes them if the message was +** delivered to at least one rcpt. +** Returns TRUE if at least one msg was delivered to at least one rcpt. */ gboolean -deliver_msglist_host_smtp(connect_route *route, GList *msgout_list, gchar *host, GList *res_list) +deliver_msglist_host_smtp(connect_route *route, GList *msgout_list, + gchar *host, GList *res_list) { gboolean ok = FALSE; GList *msgout_node; @@ -477,7 +490,7 @@ } /* - delivers messages in msgout_list using route +** delivers messages in msgout_list using route */ gboolean deliver_route_msgout_list(connect_route *route, GList *msgout_list) @@ -501,11 +514,12 @@ return FALSE; } - /* TODO: It would be nice to be able to fork for each host. - We cannot do that yet because of complications with finishing the - messages. Threads could be a solution because they use the same - memory. But we are not thread safe yet... - */ + /* + ** TODO: It would be nice to be able to fork for each host. + ** We cannot do that yet because of complications with finishing the + ** messages. Threads could be a solution because they use the same + ** memory. But we are not thread safe yet... + */ foreach(mo_ph_list, mo_ph_node) { msgout_perhost *mo_ph = (msgout_perhost *) (mo_ph_node->data); if (deliver_msglist_host(route, mo_ph->msgout_list, mo_ph->host, route->resolve_list)) { @@ -518,8 +532,9 @@ } /* - calls route_prepare_msg() - delivers messages in msg_list using route by calling deliver_route_msgout_list() +** calls route_prepare_msg() +** delivers messages in msg_list using route by calling +** deliver_route_msgout_list() */ gboolean deliver_route_msg_list(connect_route *route, GList *msgout_list) @@ -536,12 +551,16 @@ GList *rcpt_list_non_delivered = NULL; GList *rcpt_node; - /* we have to delete already delivered rcpt's because a - previous route may have delivered to it */ + /* + ** we have to delete already delivered rcpt's because a + ** previous route may have delivered to it + */ foreach(msgout_cloned->rcpt_list, rcpt_node) { address *rcpt = (address *) (rcpt_node->data); - /* failed addresses already have been bounced; - there should be a better way to handle those. */ + /* + ** failed addresses already have been bounced; + ** there should be a better way to handle those. + */ if (!addr_is_delivered(rcpt) && !addr_is_failed(rcpt) && !(rcpt->flags & ADDR_FLAG_LAST_ROUTE)) { rcpt_list_non_delivered = g_list_append(rcpt_list_non_delivered, rcpt); @@ -596,8 +615,9 @@ return ok; } -/* copy pointers of delivered addresses to the msg's non_rcpt_list, - to make sure that they will not be delivered again. +/* +** copy pointers of delivered addresses to the msg's non_rcpt_list, +** to make sure that they will not be delivered again. */ void update_non_rcpt_list(msg_out *msgout) @@ -613,12 +633,13 @@ } } -/* after delivery attempts, we check if there are any rcpt addresses left in - the message. If all addresses have been completed, the spool files will be - deleted, otherwise the header spool will be written back. We never changed - the data spool, so there is no need to write that back. - - returns TRUE if all went well. +/* +** after delivery attempts, we check if there are any rcpt addresses left in +** the message. If all addresses have been completed, the spool files will be +** deleted, otherwise the header spool will be written back. We never changed +** the data spool, so there is no need to write that back. +** +** returns TRUE if all went well. */ gboolean deliver_finish(msg_out *msgout) @@ -629,18 +650,21 @@ update_non_rcpt_list(msgout); - /* we NEVER made copies of the addresses, flags affecting addresses - were always set on the original address structs */ + /* + ** we NEVER made copies of the addresses, flags affecting addresses + ** were always set on the original address structs + */ foreach(msg->rcpt_list, rcpt_node) { address *rcpt = (address *) (rcpt_node->data); if (!addr_is_finished_children(rcpt)) { finished = FALSE; } else { - /* if ALL children have been delivered, mark parent as - delivered. if there is one or more not delivered, - it must have failed, we mark the parent as failed - as well. - */ + /* + ** if ALL children have been delivered, mark parent as + ** delivered. if there is one or more not delivered, + ** it must have failed, we mark the parent as failed + ** as well. + */ if (addr_is_delivered_children(rcpt)) { addr_mark_delivered(rcpt); } else { @@ -728,8 +752,8 @@ } /* - This function splits the list of rcpt addresses - into local and remote addresses and processes them accordingly. +** This function splits the list of rcpt addresses +** into local and remote addresses and processes them accordingly. */ gboolean deliver_msg_list(GList *msg_list, guint flags) @@ -839,10 +863,10 @@ } /* - deliver() is called when a message has just been received - (mode_accept and smtp_in) and should be delivered immediately - (neither -odq nor do_queue). Only this one message will be tried to - deliver then. +** deliver() is called when a message has just been received +** (mode_accept and smtp_in) and should be delivered immediately +** (neither -odq nor do_queue). Only this one message will be tried to +** deliver then. */ gboolean deliver(message *msg)
--- a/src/dotlock.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/dotlock.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 2001 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 2001 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <glib.h>
--- a/src/dotlock.h Thu Sep 22 15:07:40 2011 +0200 +++ b/src/dotlock.h Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 2001 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 2001 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define MAX_LOCKAGE 300
--- a/src/expand.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/expand.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 2000-2001 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 2000-2001 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "masqmail.h"
--- a/src/fail_msg.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/fail_msg.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 2000-2001 Oliver Kurth - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* +** MasqMail +** Copyright (C) 2000-2001 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ #include <sys/wait.h> @@ -23,7 +24,8 @@ #include "readsock.h" gboolean -fail_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, va_list args) +fail_msg(message *msg, gchar *template, GList *failed_rcpts, gchar *err_fmt, + va_list args) { gboolean ok = FALSE; address *ret_path = NULL; @@ -124,11 +126,10 @@ } /* -ival : |--|--|----|--------|--------| -warned: |-------W-------------W------ -result: |nnnyyyynnnnyyyyyyyyyynnnnnnn +** ival : |--|--|----|--------|--------| +** warned: |-------W-------------W------ +** result: |nnnyyyynnnnyyyyyyyyyynnnnnnn */ - static gboolean warn_msg_is_due(message *msg) { @@ -155,7 +156,8 @@ } gboolean -warn_msg(message *msg, gchar *template, GList *defered_rcpts, gchar *err_fmt, va_list args) +warn_msg(message *msg, gchar *template, GList *defered_rcpts, gchar *err_fmt, + va_list args) { time_t now = time(NULL);
--- a/src/header.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/header.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 2000 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 2000 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "masqmail.h" @@ -66,9 +67,10 @@ return buf; } -/* finds list of headers matching id - if id == HEAD_UNKNOWN and header == NULL finds all unknown headers - else finds all headers matching header +/* +** finds list of headers matching id +** if id == HEAD_UNKNOWN and header == NULL finds all unknown headers +** else finds all headers matching header */ GList* find_header(GList *hdr_list, header_id id, gchar *hdr_str) @@ -129,8 +131,8 @@ } /* - fold the header at maxlen chars (newline excluded) - (We exclude the newline because the RFCs deal with it this way) +** fold the header at maxlen chars (newline excluded) +** (We exclude the newline because the RFCs deal with it this way) */ void header_fold(header *hdr, unsigned int maxlen) @@ -155,9 +157,11 @@ } printf("stripped len: %d\n", len); - /* FIXME: would be nice to have a better size calculation */ - /* (the current size + what we insert as break, twice as often as - we have breaks in the optimal case) */ + /* + ** FIXME: would be nice to have a better size calculation + ** (the current size + what we insert as break, twice as often as + ** we have breaks in the optimal case) + */ tmp = malloc(len + 2 * (len/maxlen) * strlen("\n\t")); dest = tmp; @@ -223,8 +227,10 @@ hdr->header = g_strdup_vprintf(fmt, args); hdr->value = NULL; - /* value shall point to the first non-whitespace char in the - value part of the header line (i.e. after the first colon) */ + /* + ** value shall point to the first non-whitespace char in the + ** value part of the header line (i.e. after the first colon) + */ p = strchr(hdr->header, ':'); if (p) { p++; @@ -292,8 +298,10 @@ p++; } hdr->value = p; - /* Note: an empty value can also mean that it's only the first part - of a folded header line */ + /* + ** Note: an empty value can also mean that it's only the first part + ** of a folded header line + */ for (i = 0; i < HEAD_NUM_IDS; i++) { if (strcasecmp(header_names[i].header, buf) == 0) {
--- a/src/interface.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/interface.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,25 +1,26 @@ -/* MasqMail - Copyright (C) 2000 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 2000 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "masqmail.h" /* define if you get problems... */ -/*#define SOCKADDR_OLD 1*/ +/* #define SOCKADDR_OLD 1 */ gboolean init_sockaddr(struct sockaddr_in *name, interface *iface)
--- a/src/listen.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/listen.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 1999/2000 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999/2000 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <sys/wait.h> @@ -141,10 +142,12 @@ while (1) { - /* if we were interrupted by an incoming connection (or a signal) - we have to recalculate the time until the next queue run should - occur. select may put a value into tm, but doc for select() says - we should not use it. */ + /* + ** if we were interrupted by an incoming connection (or a + ** signal) we have to recalculate the time until the next + ** queue run should occur. select may put a value into tm, + ** but doc for select() says we should not use it. + */ if (qival > 0) { time(&time_now); if (sel_ret == 0) { /* we are either just starting or did a queue run */ @@ -160,8 +163,11 @@ tm.tv_sec = 0; } } - /* Block until input arrives on one or more active sockets, - or signal arrives, or queuing interval time elapsed (if qival > 0) */ + /* + ** Block until input arrives on one or more active sockets, + ** or signal arrives, or queuing interval time elapsed + ** (if qival > 0) + */ read_fd_set = active_fd_set; if ((sel_ret = select(FD_SETSIZE, &read_fd_set, NULL, NULL, qival > 0 ? &tm : NULL)) < 0) { if (errno != EINTR) { @@ -194,8 +200,10 @@ } } } else { - /* If select returns 0, the interval time has elapsed. - We start a new queue runner process */ + /* + ** If select returns 0, the interval time has elapsed. + ** We start a new queue runner process + */ int pid; signal(SIGCHLD, sigchld_handler); if ((pid = fork()) == 0) {
--- a/src/local.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/local.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <sys/wait.h> @@ -131,10 +132,12 @@ } if (!uid_ok || !gid_ok) { - /* FIXME: if this fails we HAVE to exit, because we shall not run - with some users id. But we do not return, and so this message - will not be finished, so the user will get the message again - next time a delivery is attempted... */ + /* + ** FIXME: if this fails we HAVE to exit, because we shall + ** not run with some users id. But we do not return, and so + ** this message will not be finished, so the user will get + ** the message again next time a delivery is attempted... + */ logwrite(LOG_ALERT, "could not set back uid or gid after local delivery: %s\n", strerror(errno)); logwrite(LOG_ALERT, "uid=%d, gid=%d, euid=%d, egid=%d, want = %d, %d\n", getuid(), getgid(), geteuid(), getegid(), saved_uid, saved_gid);
--- a/src/log.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/log.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <sysexits.h>
--- a/src/lookup.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/lookup.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,21 +1,22 @@ -/* MasqMail - * Copyright (C) Oliver Kurth - * Copyright (C) markus schnalke <meillo@marmaro.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* +** MasqMail +** Copyright (C) Oliver Kurth +** Copyright (C) markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ #include <sys/types.h> #include <netinet/in.h> @@ -64,10 +65,10 @@ if (resp_len <= 0) { /* - if (errno == ECONNREFUSED) return DNS_SOFT; - if (h_errno == TRY_AGAIN) return DNS_SOFT; - return DNS_HARD; - */ + ** if (errno == ECONNREFUSED) return DNS_SOFT; + ** if (h_errno == TRY_AGAIN) return DNS_SOFT; + ** return DNS_HARD; + */ return -1; } if (resp_len >= sizeof(response)) @@ -257,10 +258,11 @@ DEBUG(5) debugf("DNS: found %d mx records\n", cnt); - /* to randomize sequences with equal pref values, - we temporarily 'misused' the ip field and - put a random number in it as a secondary sort key. - */ + /* + ** to randomize sequences with equal pref values, + ** we temporarily 'misused' the ip field and + ** put a random number in it as a secondary sort key. + */ list = g_list_sort(list, _mx_sort_func); /* CNAME resolving has to be added as well. */
--- a/src/lookup.h Thu Sep 22 15:07:40 2011 +0200 +++ b/src/lookup.h Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - * Copyright (C) Oliver Kurth, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* +** MasqMail +** Copyright (C) Oliver Kurth, +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ #define MAX_DNSNAME MAXDNAME
--- a/src/masqmail.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/masqmail.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <stdio.h> @@ -34,9 +35,11 @@ #include "masqmail.h" -/* mutually exclusive modes. Note that there is no 'queue daemon' mode. - It, as well as the distinction beween the two (non exclusive) daemon - (queue and listen) modes, is handled by flags.*/ +/* +** mutually exclusive modes. Note that there is no 'queue daemon' mode. +** It, as well as the distinction beween the two (non exclusive) daemon +** (queue and listen) modes, is handled by flags. +*/ enum mta_mode { MODE_NONE = 0, /* to check if a mode was set */ MODE_ACCEPT, /* accept message on stdin (fallback mode) */ @@ -95,11 +98,11 @@ #endif /* -argv: the original argv -argp: number of arg (may get modified!) -cp: pointing to the char after the option - e.g. `-d 6' `-d6' - ^ ^ +** argv: the original argv +** argp: number of arg (may get modified!) +** cp: pointing to the char after the option +** e.g. `-d 6' `-d6' +** ^ ^ */ gchar* get_optarg(char *argv[], gint *argp, char *cp) @@ -161,9 +164,10 @@ conf.do_verbose = FALSE; - /* closing and reopening the log ensures that it is open afterwards - because it is possible that the log is assigned to fd 1 and gets - thus closes by fclose(stdout). Similar for the debugfile. + /* + ** closing and reopening the log ensures that it is open afterwards + ** because it is possible that the log is assigned to fd 1 and gets + ** thus closes by fclose(stdout). Similar for the debugfile. */ logclose(); fclose(stdin); @@ -204,7 +208,8 @@ /* default mode if address args or -t is specified, or called as rmail */ static void -mode_accept(address *return_path, gchar *full_sender_name, guint accept_flags, char **addresses, int addr_cnt) +mode_accept(address *return_path, gchar *full_sender_name, guint accept_flags, + char **addresses, int addr_cnt) { /* accept message on stdin */ accept_error err; @@ -293,11 +298,11 @@ exit(0); } else { /* - TODO: - Should we really fail here? Because the mail is queued - already. If we fail the client might submit it again. - If at-once-delivery is seen as an additional best-effort - service, then we should still exit successful here. + ** TODO: Should we really fail here? Because the + ** mail is queued already. If we fail the client + ** might submit it again. If at-once-delivery + ** is seen as an additional best-effort service, + ** then we should still exit successful here. */ exit(1); } @@ -305,11 +310,11 @@ } /* -if -Mrm is given - -currently only the `rm' command is supported -until this changes, we don't need any facility for further commands -return success if at least one message had been deleted +** if -Mrm is given +** +** currently only the `rm' command is supported +** until this changes, we don't need any facility for further commands +** return success if at least one message had been deleted */ static int manipulate_queue(char *cmd, char *id[]) @@ -387,8 +392,10 @@ if (route_name) { conf.online_query = g_strdup_printf("/bin/echo %s", route_name); } - /* TODO: change behavior of `-qo without argument'? - Because that behavior is included in -q. */ + /* + ** TODO: change behavior of `-qo without argument'? + ** Because that behavior is included in -q. + */ ret = queue_run_online(); } return ret; @@ -412,7 +419,8 @@ with_ident = " +ident"; #endif - printf("%s %s%s%s%s\n", PACKAGE, VERSION, with_resolver, with_auth, with_ident); + printf("%s %s%s%s%s\n", PACKAGE, VERSION, with_resolver, with_auth, + with_ident); } void @@ -462,9 +470,11 @@ } else if (strcmp(progname, "newaliases") == 0) { mta_mode = MODE_BI; } else if (strcmp(progname, "rmail") == 0) { - /* the `rmail' alias should probably be removed now - that we have the rmail script. But let's keep it - for some while for compatibility. 2010-06-19 */ + /* + ** the `rmail' alias should probably be removed now + ** that we have the rmail script. But let's keep it + ** for some while for compatibility. 2010-06-19 + */ mta_mode = MODE_ACCEPT; opt_i = TRUE; } else if (strcmp(progname, "runq") == 0) { @@ -601,10 +611,10 @@ if (!mta_mode && arg==argc && !opt_t) { /* - In this case no rcpts can be found, thus no mail - can be sent, thus masqmail will always fail. We - rather do something better instead. This covers - also the case of calling masqmail without args. + ** In this case no rcpts can be found, thus no mail + ** can be sent, thus masqmail will always fail. We + ** rather do something better instead. This covers + ** also the case of calling masqmail without args. */ mode_version(); exit(0); @@ -638,13 +648,14 @@ init_conf(); - /* if we are not privileged, and the config file was changed we - implicetely set the the run_as_user flag and give up all - privileges. - - So it is possible for a user to run his own daemon without - breaking security. - */ + /* + ** if we are not privileged, and the config file was changed we + ** implicetely set the the run_as_user flag and give up all + ** privileges. + ** + ** So it is possible for a user to run his own daemon without + ** breaking security. + */ if ((strcmp(conf_file, CONF_FILE) != 0) && (conf.orig_uid != 0)) { conf.run_as_user = TRUE; set_euidgid(conf.orig_uid, conf.orig_gid, NULL, NULL); @@ -677,12 +688,13 @@ conf.debug_level = debug_level; } - /* It appears that changing to / ensures that we are never in - a directory which we cannot access. This situation could be - possible after changing identity. - Maybe we should only change to / if we not run as user, to - allow relative paths for log files in test setups for - instance. + /* + ** It appears that changing to / ensures that we are never in + ** a directory which we cannot access. This situation could be + ** possible after changing identity. + ** Maybe we should only change to / if we not run as user, to + ** allow relative paths for log files in test setups for + ** instance. */ chdir("/");
--- a/src/masqmail.h Thu Sep 22 15:07:40 2011 +0200 +++ b/src/masqmail.h Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <config.h> @@ -140,8 +141,10 @@ GList *not_local_addresses; GList *listen_addresses; - /* ANSI C defines unsigned long to be at least 32bit - i.e. ca. 4GB max; that should be enough. */ + /* + ** ANSI C defines unsigned long to be at least 32bit + ** i.e. ca. 4GB max; that should be enough. + */ gulong max_msg_size; gboolean do_save_envelope_to;
--- a/src/md5/hmac_md5.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/md5/hmac_md5.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,30 +1,30 @@ /* -hmac_md5 -- implements RFC 2104 - -Copyright 2010, markus schnalke <meillo@marmaro.de> - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -My motivation to write this code was the lack of a nicely licensed -hmac_md5 function in C. I programmed it following the RFC's text. -Obviously this code is highly similar to the sample code of the RFC. -The code is tested against the test vectors of the RFC. Wikipedia's -HMAC page helped me to understand the algorithm better. - -This hmac_md5 function requires an OpenSSL-compatible MD5 -implementation. There are Public Domain MD5 implementations by Colin -Plumb and by Solar Designer. You probably want to use one of these. +** hmac_md5 -- implements RFC 2104 +** +** Copyright 2010, markus schnalke <meillo@marmaro.de> +** +** Permission to use, copy, modify, and/or distribute this software for any +** purpose with or without fee is hereby granted, provided that the above +** copyright notice and this permission notice appear in all copies. +** +** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +** WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +** MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +** ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +** WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +** ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +** OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +** +** +** My motivation to write this code was the lack of a nicely licensed +** hmac_md5 function in C. I programmed it following the RFC's text. +** Obviously this code is highly similar to the sample code of the RFC. +** The code is tested against the test vectors of the RFC. Wikipedia's +** HMAC page helped me to understand the algorithm better. +** +** This hmac_md5 function requires an OpenSSL-compatible MD5 +** implementation. There are Public Domain MD5 implementations by Colin +** Plumb and by Solar Designer. You probably want to use one of these. */ #include <string.h> @@ -36,11 +36,12 @@ /* -The computed HMAC will be written to `digest'. -Ensure digest points to hashsize bytes of allocated memory. +** The computed HMAC will be written to `digest'. +** Ensure digest points to hashsize bytes of allocated memory. */ void -hmac_md5(unsigned char *text, int textlen, unsigned char *key, int keylen, unsigned char *digest) +hmac_md5(unsigned char *text, int textlen, unsigned char *key, int keylen, + unsigned char *digest) { int i; MD5_CTX context;
--- a/src/md5/hmactest.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/md5/hmactest.c Thu Oct 20 10:20:59 2011 +0200 @@ -6,23 +6,23 @@ #include "hmac_md5.h" /* -instead of pad0_copy(d, s, sz) use: - memset(d, 0, sz); - memcpy(d, s, strlen(s)); - -static void -pad0_copy(char *d, char *s, int sz) -{ - int i = 0; - while (*s && (i < sz)) { - *(d++) = *(s++); - i++; - } - while (i <= sz) { - *(d++) = 0; - i++; - } -} +** instead of pad0_copy(d, s, sz) use: +** memset(d, 0, sz); +** memcpy(d, s, strlen(s)); +** +** static void +** pad0_copy(char *d, char *s, int sz) +** { +** int i = 0; +** while (*s && (i < sz)) { +** *(d++) = *(s++); +** i++; +** } +** while (i <= sz) { +** *(d++) = 0; +** i++; +** } +** } */ int
--- a/src/message.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/message.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "masqmail.h" @@ -31,19 +32,19 @@ } /* - This function is currently (0.2.24) only used for client side SMTP - SIZE support (RFC 1870). The flag is_smtp is always true therefore. - - Their definition of the message size in RFC 1870 is: - - The message size is defined as the number of octets, including - CR-LF pairs, but not the SMTP DATA command's terminating dot - or doubled quoting dots, to be transmitted by the SMTP client - after receiving reply code 354 to the DATA command. - - l_cnt (line count) covers '\r' characters which are not present in - masqmail's internal format. Dots are also not stuffed in the - internal format. Dot-stuffing is ignored in the size. +** This function is currently (0.2.24) only used for client side SMTP +** SIZE support (RFC 1870). The flag is_smtp is always true therefore. +** +** Their definition of the message size in RFC 1870 is: +** +** The message size is defined as the number of octets, including +** CR-LF pairs, but not the SMTP DATA command's terminating dot +** or doubled quoting dots, to be transmitted by the SMTP client +** after receiving reply code 354 to the DATA command. +** +** l_cnt (line count) covers '\r' characters which are not present in +** masqmail's internal format. Dots are also not stuffed in the +** internal format. Dot-stuffing is ignored in the size. */ gint msg_calc_size(message *msg, gboolean is_smtp)
--- a/src/mservdetect.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/mservdetect.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -72,19 +73,20 @@ return NULL; } - /* this is the protocol (reverse engineered): - - S: READY - C: STAT - | - +----------------+-----------------+ - | | | - S: DOWN S: UP foo:-1 S: UP foo:1 - C: QUIT C: QUIT C: QUIT - - -> offline -> offline -> online - `foo' gets printed - + /* + ** this is the protocol (reverse engineered): + ** + ** S: READY + ** C: STAT + ** | + ** +----------------+-----------------+ + ** | | | + ** S: DOWN S: UP foo:-1 S: UP foo:1 + ** C: QUIT C: QUIT C: QUIT + ** + ** -> offline -> offline -> online + ** `foo' gets printed + ** */ if (strncmp(buf, "READY", 5) == 0) {
--- a/src/online.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/online.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2008, 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2008, 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <sys/wait.h>
--- a/src/parse.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/parse.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,33 +1,35 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef PARSE_TEST #include "masqmail.h" #endif -/* This is really dangerous. I hope that I was careful enough, - but maybe there is some malformed address possible that causes - this to segfault or be caught in endless loops. +/* +** This is really dangerous. I hope that I was careful enough, +** but maybe there is some malformed address possible that causes +** this to segfault or be caught in endless loops. - If you find something like that, PLEASE mail the string to me - (no matter how idiotic it is), so that I can debug that. - Those things really should not happen. +** If you find something like that, PLEASE mail the string to me +** (no matter how idiotic it is), so that I can debug that. +** Those things really should not happen. */ static gchar *specials = "()<>@,;:\\\".[]`"; @@ -134,8 +136,8 @@ } gboolean -parse_address_rfc822(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin, - gchar **domain_end, gchar **address_end) +parse_address_rfc822(gchar *string, gchar **local_begin, gchar **local_end, + gchar **domain_begin, gchar **domain_end, gchar **address_end) { gint angle_brackets = 0; @@ -183,8 +185,10 @@ p++; } } - /* we now have a non-space char that is not - the beginning of a comment */ + /* + ** we now have a non-space char that is not + ** the beginning of a comment + */ if (*p == '@' || *p == ',') { /* the last word was the local_part of an addr-spec */ @@ -284,8 +288,8 @@ } gboolean -parse_address_rfc821(gchar *string, gchar **local_begin, gchar **local_end, gchar **domain_begin, - gchar **domain_end, gchar **address_end) +parse_address_rfc821(gchar *string, gchar **local_begin, gchar **local_end, + gchar **domain_begin, gchar **domain_end, gchar **address_end) { gint angle_brackets = 0; @@ -371,12 +375,12 @@ } /* - allocate address, reading from string. - On failure, returns NULL. - after call, end contains a pointer to the end of the parsed string - end may be NULL, if we are not interested. - - parses both rfc 821 and rfc 822 addresses, depending on flag is_rfc821 +** allocate address, reading from string. +** On failure, returns NULL. +** after call, end contains a pointer to the end of the parsed string +** end may be NULL, if we are not interested. +** +** parses both rfc 821 and rfc 822 addresses, depending on flag is_rfc821 */ address* _create_address(gchar *string, gchar **end, gboolean is_rfc821)
--- a/src/peopen.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/peopen.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,6 +1,7 @@ -/* This a snippet I found in sourceforge. I just changed the identing - style to my own and deleted the main function. -- oku - The functions destroy_argv() and create_argv() were added by oku. +/* +** This a snippet I found in sourceforge. I just changed the identing +** style to my own and deleted the main function. -- oku +** The functions destroy_argv() and create_argv() were added by oku. */ #include <errno.h> @@ -55,7 +56,8 @@ } FILE* -peidopen(const char *command, const char *type, char *const envp[], int *ret_pid, uid_t uid, gid_t gid) +peidopen(const char *command, const char *type, char *const envp[], + int *ret_pid, uid_t uid, gid_t gid) { enum { Read, Write } mode; int pipe_fd[2]; @@ -93,7 +95,7 @@ if (close(pipe_fd[mode == Read ? 0 : 1]) != -1 && dup2(pipe_fd[mode == Read ? 1 : 0], mode == Read ? STDOUT_FILENO : STDIN_FILENO) != -1) { - /* char *argv [] = { "/bin/sh", "-c", (char*) command, NULL }; */ + /* char *argv [] = { "/bin/sh", "-c", (char*) command, NULL }; */ char **argv = create_argv(command, 10); int ret;
--- a/src/permissions.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/permissions.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 2000 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 2000 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <pwd.h>
--- a/src/queue.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/queue.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <sys/stat.h> @@ -49,8 +50,10 @@ gchar *pattern; int i, *idx_arr; - /* Escaping the question marks prevents them from being - interpreted as trigraphs */ + /* + ** Escaping the question marks prevents them from being + ** interpreted as trigraphs + */ pattern = g_strdup_printf("%s/input/?????\?-??\?-?\?-H", conf.spool_dir); gl.gl_offs = 0; glob(pattern, 0, NULL, &gl);
--- a/src/readsock.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/readsock.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 2000 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 2000 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <signal.h> @@ -131,7 +132,8 @@ } int -read_sockline1(FILE *in, char **pbuf, int *buf_len, int timeout, unsigned int flags) +read_sockline1(FILE *in, char **pbuf, int *buf_len, int timeout, + unsigned int flags) { int p = 0, size = *buf_len; char *buf;
--- a/src/readsock.h Thu Sep 22 15:07:40 2011 +0200 +++ b/src/readsock.h Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 2000 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 2000 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define READSOCKL_CHUG 0x01
--- a/src/readtest.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/readtest.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,4 +1,3 @@ - #include "masqmail.h" #include "readsock.h"
--- a/src/resolvtest.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/resolvtest.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,22 @@ -/* MasqMail Copyright (C) Oliver Kurth, -/* Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* +** MasqMail +** Copyright (C) Oliver Kurth, +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ #include <sys/types.h>
--- a/src/rewrite.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/rewrite.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef REWRITE_TEST
--- a/src/route.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/route.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <fnmatch.h> @@ -50,9 +51,10 @@ void rewrite_headers(msg_out *msgout, connect_route *route) { - /* if set_h_from_domain is set, replace domain in all - From: headers. - */ + /* + ** if set_h_from_domain is set, replace domain in all + ** From: headers. + */ msgout->hdr_list = g_list_copy(msgout->msg->hdr_list); /* map from addresses */ @@ -191,14 +193,15 @@ } /* -Split a recipient list into the three groups: -- local recipients -- those maching the patterns -- those not matching the patterns -If patterns is NULL: only splitting between local and others is done. +** Split a recipient list into the three groups: +** - local recipients +** - those maching the patterns +** - those not matching the patterns +** If patterns is NULL: only splitting between local and others is done. */ void -split_rcpts(GList *rcpt_list, GList *patterns, GList **rl_local, GList **rl_matching, GList **rl_others) +split_rcpts(GList *rcpt_list, GList *patterns, GList **rl_local, + GList **rl_matching, GList **rl_others) { GList *rcpt_node; GList *host_node = NULL; @@ -215,8 +218,10 @@ if (rl_local) *rl_local = g_list_append(*rl_local, rcpt); } else { - /* if patterns is NULL, host_node will be NULL, - hence all non-locals are put to others */ + /* + ** if patterns is NULL, host_node will be NULL, + ** hence all non-locals are put to others + */ foreach(patterns, host_node) { gchar *host = (gchar *) (host_node->data); if (fnmatch(host, rcpt->domain, FNM_CASEFOLD) == 0) @@ -234,8 +239,8 @@ } /* -Return a new list of the local rcpts in the rcpt_list -TODO: This function is almost exactly the same as remote_rcpts(). Merge? +** Return a new list of the local rcpts in the rcpt_list +** TODO: This function is almost exactly the same as remote_rcpts(). Merge? */ GList* local_rcpts(GList *rcpt_list) @@ -257,8 +262,8 @@ } /* -Return a new list of non-local rcpts in the rcpt_list -TODO: This function is almost exactly the same as local_rcpts(). Merge? +** Return a new list of non-local rcpts in the rcpt_list +** TODO: This function is almost exactly the same as local_rcpts(). Merge? */ GList* remote_rcpts(GList *rcpt_list) @@ -317,8 +322,8 @@ } /* - Make lists of matching/not matching rcpts. - Local domains are NOT regared here, these should be sorted out previously +** Make lists of matching/not matching rcpts. +** Local domains are NOT regared here, these should be sorted out previously */ void route_split_rcpts(connect_route *route, GList *rcpt_list, GList **p_rcpt_list, GList **p_non_rcpt_list) @@ -356,9 +361,10 @@ } } - /* rewrite return path if there is a table, use that - if an address is found and if it has a domain, use that - */ + /* + ** rewrite return path if there is a table, use that + ** if an address is found and if it has a domain, use that + */ if (route->map_return_path_addresses) { address *ret_path = NULL; DEBUG(5) debugf("looking up %s in map_return_path_addresses\n", msg->return_path->local_part); @@ -383,11 +389,11 @@ return NULL; } -/* put msgout's is msgout_list into bins (msgout_perhost structs) for each - host. Used if there is no mail_host. - route param is not used, we leave it here because that may change. - */ - +/* +** put msgout's is msgout_list into bins (msgout_perhost structs) for each +** host. Used if there is no mail_host. +** route param is not used, we leave it here because that may change. +*/ GList* route_msgout_list(connect_route *route, GList *msgout_list) { @@ -415,8 +421,13 @@ /* there is already a rcpt for this host */ msg_out *msgout_last = (msg_out *) ((g_list_last(mo_ph->msgout_list))->data); if (msgout_last->msg == msgout->msg) { - /* if it is also the same message, it must be the last one appended - to mo_ph->msgout_list (since outer loop goes through msgout_list) */ + /* + ** if it is also the same message, + ** it must be the last one + ** appended to mo_ph->msgout_list + ** (since outer loop goes through + ** msgout_list) + */ msgout_last->rcpt_list = g_list_append(msgout_last->rcpt_list, rcpt); } else { /* if not, we append a new msgout */
--- a/src/smtp_in.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/smtp_in.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,32 +1,33 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "masqmail.h" #include "readsock.h" /* - I always forget these rfc numbers: - RFC 821 (SMTP) - RFC 1869 (ESMTP) - RFC 1870 (ESMTP SIZE) - RFC 2197 (ESMTP PIPELINE) - RFC 2554 (ESMTP AUTH) +** I always forget these rfc numbers: +** RFC 821 (SMTP) +** RFC 1869 (ESMTP) +** RFC 1870 (ESMTP SIZE) +** RFC 2197 (ESMTP PIPELINE) +** RFC 2554 (ESMTP AUTH) */ @@ -74,10 +75,11 @@ } -/* this is a quick hack: we expect the address to be syntactically correct - and containing the mailbox only, though we first check for size in - smtp_in(). - Return false if address is too long. +/* +** this is a quick hack: we expect the address to be syntactically correct +** and containing the mailbox only, though we first check for size in +** smtp_in(). +** Return false if address is too long. */ static gboolean get_address(gchar *line, gchar *addr)
--- a/src/smtp_out.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/smtp_out.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,29 +1,30 @@ -/* smtp_out.c - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* +** smtp_out.c +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ /* - I always forget these rfc numbers: - RFC 821 (SMTP) - RFC 1869 (ESMTP) - RFC 1870 (ESMTP SIZE) - RFC 2197 (ESMTP PIPELINE) - RFC 2554 (ESMTP AUTH) +** I always forget these rfc numbers: +** RFC 821 (SMTP) +** RFC 1869 (ESMTP) +** RFC 1870 (ESMTP SIZE) +** RFC 2197 (ESMTP PIPELINE) +** RFC 2554 (ESMTP AUTH) */ #include "masqmail.h" @@ -73,9 +74,12 @@ if (host_entry) { psb->helo_name = g_strdup(host_entry->h_name); } else { - /* we failed to look up our own name. Instead of giving our local hostname, - we may give our IP number to show the server that we are at least - willing to be honest. For the really picky ones. */ + /* + ** we failed to look up our own name. Instead of + ** giving our local hostname, we may give our IP + ** number to show the server that we are at least + ** willing to be honest. For the really picky ones. + */ DEBUG(5) debugf("failed to look up own host name.\n"); psb->helo_name = g_strdup_printf("[%s]", inet_ntoa(sname.sin_addr)); } @@ -276,20 +280,20 @@ } /* -We first try EHLO, but if it fails HELO in a second fall back try. -This is what is requested by RFC 2821 (sec 3.2): - - Once the server has sent the welcoming message and - the client has received it, the client normally sends - the EHLO command to the server, [...] - For a particular connection attempt, if the server - returns a "command not recognized" response to EHLO, - the client SHOULD be able to fall back and send HELO. - -Up to and including version 0.3.0 masqmail used ESMTP only if the -string ``ESMTP'' appeared within the server's greeting message. This -made it impossible to use AUTH with servers that would send odd -greeting messages. +** We first try EHLO, but if it fails HELO in a second fall back try. +** This is what is requested by RFC 2821 (sec 3.2): +** +** Once the server has sent the welcoming message and +** the client has received it, the client normally sends +** the EHLO command to the server, [...] +** For a particular connection attempt, if the server +** returns a "command not recognized" response to EHLO, +** the client SHOULD be able to fall back and send HELO. +** +** Up to and including version 0.3.0 masqmail used ESMTP only if the +** string ``ESMTP'' appeared within the server's greeting message. This +** made it impossible to use AUTH with servers that would send odd +** greeting messages. */ static gboolean smtp_helo(smtp_base *psb, gchar *helo) @@ -310,8 +314,10 @@ return FALSE; } - /* our guess that server understands EHLO could have been wrong, - try again with HELO */ + /* + ** our guess that server understands EHLO could have been wrong, + ** try again with HELO + */ fprintf(psb->out, "HELO %s\r\n", helo); fflush(psb->out); @@ -357,13 +363,13 @@ static void send_data_line(smtp_base *psb, gchar *data) { - /* According to RFC 821 each line should be terminated with CRLF. - Since a dot on a line itself marks the end of data, each line - beginning with a dot is prepended with another dot. - */ + /* + ** According to RFC 821 each line should be terminated with CRLF. + ** Since a dot on a line itself marks the end of data, each line + ** beginning with a dot is prepended with another dot. + */ gchar *ptr; - gboolean new_line = TRUE; /* previous versions assumed that each item was exactly one line. - This is no longer the case */ + gboolean new_line = TRUE; /* previous versions assumed that each item was exactly one line. This is no longer the case */ ptr = data; while (*ptr) { @@ -702,7 +708,8 @@ } gint -smtp_out_msg(smtp_base *psb, message *msg, address *return_path, GList *rcpt_list, GList *hdr_list) +smtp_out_msg(smtp_base *psb, message *msg, address *return_path, + GList *rcpt_list, GList *hdr_list) { gint i, size; gboolean ok = TRUE; @@ -732,8 +739,10 @@ } if (ok) { - /* pretend the message is a bit larger, - just in case the size calculation is buggy */ + /* + ** pretend the message is a bit larger, + ** just in case the size calculation is buggy + */ smtp_cmd_mailfrom(psb, return_path, psb->use_size ? size+SMTP_SIZE_ADD : 0); if (!psb->use_pipelining) { @@ -775,8 +784,10 @@ } } - /* There is no point in going on if no recp.s were accpted. - But we can check that at this point only if not pipelining: */ + /* + ** There is no point in going on if no recp.s were accpted. + ** But we can check that at this point only if not pipelining: + */ ok = (ok && (psb->use_pipelining || (rcpt_accept > 0))); if (ok) { @@ -786,17 +797,22 @@ DEBUG(4) debugf("C: DATA\r\n"); if (psb->use_pipelining) { - /* the first pl'ed command was MAIL FROM - the last was DATA, whose response can be handled by the 'normal' code - all in between were RCPT TO: - */ + /* + ** the first pl'ed command was MAIL FROM + ** the last was DATA, whose response can be + ** handled by the 'normal' code all in + ** between were RCPT TO: + */ /* response to MAIL FROM: */ if ((ok = read_response(psb, SMTP_CMD_TIMEOUT))) { if ((ok = check_response(psb, FALSE))) { - /* response(s) to RCPT TO: - this is very similar to the sequence above for no pipeline - */ + /* + ** response(s) to RCPT TO: + ** this is very similar to + ** the sequence above for no + ** pipeline + */ for (i = 0; i < rcpt_cnt; i++) { if ((ok = read_response(psb, SMTP_CMD_TIMEOUT))) { address *rcpt = g_list_nth_data(rcpt_list, i); @@ -804,10 +820,12 @@ rcpt_accept++; addr_mark_delivered(rcpt); } else { - /* if server returned an error 4xx or 5xx for one recp. we - may still try the others. But if it is a timeout, eof - or unexpected response, it is more serious and we - should give up. */ + /* + ** if server returned an error 4xx or 5xx for one recp. we + ** may still try the others. But if it is a timeout, eof + ** or unexpected response, it is more serious and we + ** should give up. + */ if ((psb->error != smtp_trylater) && (psb->error != smtp_fail)) { ok = FALSE; @@ -870,9 +888,11 @@ msg->uid, addr_string(rcpt), psb->remote_host); } } else { - /* if something went wrong, - we have to unmark the rcpts prematurely marked as delivered - and mark the status */ + /* + ** if something went wrong, + ** we have to unmark the rcpts prematurely marked as + ** delivered and mark the status + */ smtp_out_mark_rcpts(psb, rcpt_list); /* log the failure: */ @@ -895,7 +915,8 @@ } gint -smtp_deliver(gchar *host, gint port, GList *resolve_list, message *msg, address *return_path, GList *rcpt_list) +smtp_deliver(gchar *host, gint port, GList *resolve_list, message *msg, + address *return_path, GList *rcpt_list) { smtp_base *psb; smtp_error err;
--- a/src/smtp_out.h Thu Sep 22 15:07:40 2011 +0200 +++ b/src/smtp_out.h Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,21 @@ -/* smtp_out.h, Copyright (C) Oliver Kurth, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* +** smtp_out.h +** Copyright (C) Oliver Kurth, +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ #include <unistd.h> #include <sys/types.h>
--- a/src/smtpsend.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/smtpsend.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 1999 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <stdio.h>
--- a/src/spool.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/spool.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2010 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2010 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <sys/stat.h> @@ -216,8 +217,9 @@ return msg; } -/* write header. uid and gid should already be set to the - mail ids. Better call spool_write(msg, FALSE). +/* +** write header. uid and gid should already be set to the +** mail ids. Better call spool_write(msg, FALSE). */ static gboolean spool_write_header(message *msg)
--- a/src/tables.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/tables.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,20 +1,21 @@ -/* MasqMail - Copyright (C) 1999-2001 Oliver Kurth - Copyright (C) 2008 markus schnalke <meillo@marmaro.de> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2001 Oliver Kurth +** Copyright (C) 2008 markus schnalke <meillo@marmaro.de> +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <fnmatch.h> @@ -72,7 +73,8 @@ } gpointer* -table_find_func(GList *table_list, gchar *key, int (*cmp_func) (const char *, const char *)) +table_find_func(GList *table_list, gchar *key, int (*cmp_func) (const char *, + const char *)) { GList *node;
--- a/src/timeival.c Thu Sep 22 15:07:40 2011 +0200 +++ b/src/timeival.c Thu Oct 20 10:20:59 2011 +0200 @@ -1,19 +1,20 @@ -/* MasqMail - Copyright (C) 1999-2002 Oliver Kurth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +/* +** MasqMail +** Copyright (C) 1999-2002 Oliver Kurth +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +** This program is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +** GNU General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; if not, write to the Free Software +** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <ctype.h>