masqmail: src/masqmail.c annotate

annotate src/masqmail.c @ 392:c5fd796ea06e

Heavy refactoring in parts of conf.c. init_conf() parse_boolean() parse_list_file() Re-arrangement of code. parse_address_glob_list() Removed unneccessary parameter. parse_list() parse_interface(): Use strtok()/strchr() instead of doing is all by hand. Removed limitation of fixed size buffer. eat_comments() Use a state machine. eat_line_trailing() eat_spaces() read_lval() Better structured code. read_conf() read_route() Removed magic numbers. Made all list type in the config files accept pathname entries, except for `permanent_routes' and `query_routes.' for which this is impossible.

author	markus schnalke <meillo@marmaro.de>
date	Sat, 18 Feb 2012 18:07:55 +0100
parents	5781ba87df95
children	cdd16614c1f5

rev	line source
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	1 /*
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	2 ** MasqMail
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	3 ** Copyright (C) 1999-2001 Oliver Kurth
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	4 ** Copyright (C) 2010 markus schnalke <meillo@marmaro.de>
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	5 **
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	6 ** This program is free software; you can redistribute it and/or modify
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	7 ** it under the terms of the GNU General Public License as published by
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	8 ** the Free Software Foundation; either version 2 of the License, or
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	9 ** (at your option) any later version.
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	10 **
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	11 ** This program is distributed in the hope that it will be useful,
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	12 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	13 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	14 ** GNU General Public License for more details.
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	15 **
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	16 ** You should have received a copy of the GNU General Public License
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	17 ** along with this program; if not, write to the Free Software
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	18 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	19 */
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	20
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	21 #include <stdio.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	22 #include <errno.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	23 #include <stdlib.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	24 #include <string.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	25 #include <unistd.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	26 #include <sys/types.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	27 #include <sys/socket.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	28 #include <sys/time.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	29 #include <netinet/in.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	30 #include <netdb.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	31 #include <syslog.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	32 #include <signal.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	33
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	34 #include <glib.h>
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	35
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	36 #include "masqmail.h"
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	37
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	38 /*
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	39 ** mutually exclusive modes. Note that there is no 'queue daemon' mode.
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	40 ** It, as well as the distinction beween the two (non exclusive) daemon
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	41 ** (queue and listen) modes, is handled by flags.
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	42 */
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	43 enum mta_mode {
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	44 MODE_NONE = 0, /* to check if a mode was set */
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	45 MODE_ACCEPT, /* accept message on stdin (fallback mode) */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	46 MODE_DAEMON, /* run as daemon */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	47 MODE_RUNQUEUE, /* single queue run, online or offline */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	48 MODE_SMTP, /* accept SMTP on stdin */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	49 MODE_LIST, /* list queue */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	50 MODE_MCMD, /* do queue manipulation */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	51 MODE_VERSION, /* show version */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	52 MODE_BI, /* fake ;-) */
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	53 };
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	54 enum mta_mode mta_mode = MODE_NONE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	55
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	56 char *pidfile = NULL;
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	57 volatile int sigterm_in_progress = 0;
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	58
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	59 static void
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	60 sigterm_handler(int sig)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	61 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	62 if (sigterm_in_progress)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	63 raise(sig);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	64 sigterm_in_progress = 1;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	65
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	66 if (pidfile) {
331 e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	67 uid_t uid = geteuid();
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	68 if (seteuid(0) != 0) {
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	69 logwrite(LOG_ALERT, "sigterm_handler: could not set euid to %d: %s\n", 0, strerror(errno));
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	70 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	71 if (unlink(pidfile) != 0)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	72 logwrite(LOG_WARNING, "could not delete pid file %s: %s\n", pidfile, strerror(errno));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	73 seteuid(uid); /* we exit anyway after this, just to be sure */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	74 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	75
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	76 signal(sig, SIG_DFL);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	77 raise(sig);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	78 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	79
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	80 /*
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	81 ** argv: the original argv
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	82 ** argp: number of arg (may get modified!)
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	83 ** cp: pointing to the char after the option
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	84 ** e.g. `-d 6' `-d6'
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	85 ** ^ ^
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	86 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	87 gchar*
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 349 diff changeset	88 get_optarg(char argv[], gint argp, char *cp)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	89 {
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	90 if (*cp) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	91 /* this kind: -xval */
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	92 return cp;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	93 }
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	94 cp = argv[*argp+1];
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	95 if (cp && (*cp != '-')) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	96 /* this kind: -x val */
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	97 (*argp)++;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	98 return cp;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	99 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	100 return NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	101 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	102
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	103 gboolean
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 349 diff changeset	104 write_pidfile(gchar *name)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	105 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	106 FILE *fptr;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	107
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	108 if ((fptr = fopen(name, "wt"))) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	109 fprintf(fptr, "%d\n", getpid());
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	110 fclose(fptr);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	111 pidfile = strdup(name);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	112 return TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	113 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	114 logwrite(LOG_WARNING, "could not write pid file: %s\n", strerror(errno));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	115 return FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	116 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	117
264 1e5e457dea18 comments and a small refactoring markus schnalke <meillo@marmaro.de> parents: 263 diff changeset	118 /* on -bd or if -q has an argument */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	119 static void
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	120 mode_daemon(gboolean do_listen, gint queue_interval, char *argv[])
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	121 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	122 guint pid;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	123
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	124 /* daemon */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	125 if (!conf.run_as_user) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	126 if ((conf.orig_uid != 0) && (conf.orig_uid != conf.mail_uid)) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	127 fprintf(stderr, "must be root or %s for daemon.\n", DEF_MAIL_USER);
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	128 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	129 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	130 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	131
74 0a5b2e96ade3 do not reparent the daemon to init if init is already the parent meillo@marmaro.de parents: 73 diff changeset	132 /* reparent to init only if init is not already the parent */
0a5b2e96ade3 do not reparent the daemon to init if init is already the parent meillo@marmaro.de parents: 73 diff changeset	133 if (getppid() != 1) {
0a5b2e96ade3 do not reparent the daemon to init if init is already the parent meillo@marmaro.de parents: 73 diff changeset	134 if ((pid = fork()) > 0) {
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	135 exit(0);
74 0a5b2e96ade3 do not reparent the daemon to init if init is already the parent meillo@marmaro.de parents: 73 diff changeset	136 } else if (pid < 0) {
208 3708b655a371 added newlines to the end of log and debug messages where missing meillo@marmaro.de parents: 205 diff changeset	137 logwrite(LOG_ALERT, "could not fork!\n");
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	138 exit(1);
74 0a5b2e96ade3 do not reparent the daemon to init if init is already the parent meillo@marmaro.de parents: 73 diff changeset	139 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	140 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	141
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	142 signal(SIGTERM, sigterm_handler);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	143 write_pidfile(PIDFILEDIR "/masqmail.pid");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	144
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	145 conf.do_verbose = FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	146
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	147 /*
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	148 ** closing and reopening the log ensures that it is open afterwards
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	149 ** because it is possible that the log is assigned to fd 1 and gets
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	150 ** thus closes by fclose(stdout). Similar for the debugfile.
72 ad034b57f3b2 fixed Debian bug 536060 (log files are closed after SIGHUP receival) meillo@marmaro.de parents: 46 diff changeset	151 */
ad034b57f3b2 fixed Debian bug 536060 (log files are closed after SIGHUP receival) meillo@marmaro.de parents: 46 diff changeset	152 logclose();
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	153 fclose(stdin);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	154 fclose(stdout);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	155 fclose(stderr);
72 ad034b57f3b2 fixed Debian bug 536060 (log files are closed after SIGHUP receival) meillo@marmaro.de parents: 46 diff changeset	156 logopen();
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	157
208 3708b655a371 added newlines to the end of log and debug messages where missing meillo@marmaro.de parents: 205 diff changeset	158 logwrite(LOG_NOTICE, "%s %s daemon starting\n", PACKAGE, VERSION);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	159 listen_port(do_listen ? conf.listen_addresses : NULL, queue_interval, argv);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	160 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	161
264 1e5e457dea18 comments and a small refactoring markus schnalke <meillo@marmaro.de> parents: 263 diff changeset	162 /* -bs or called as smtpd or in.smtpd */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	163 static void
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	164 mode_smtp()
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	165 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	166 /* accept smtp message on stdin */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	167 /* write responses to stderr. */
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	168
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	169 struct sockaddr_in saddr;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	170 gchar *peername = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	171 int dummy = sizeof(saddr);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	172
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	173 conf.do_verbose = FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	174
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	175 if (!conf.run_as_user) {
331 e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	176 set_euidgid(conf.orig_uid, conf.orig_gid, NULL, NULL);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	177 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	178
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	179 DEBUG(5) debugf("accepting smtp message on stdin\n");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	180
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	181 if (getpeername(0, (struct sockaddr *) (&saddr), &dummy) == 0) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	182 peername = g_strdup(inet_ntoa(saddr.sin_addr));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	183 } else if (errno != ENOTSOCK)
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	184 exit(1);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	185
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	186 smtp_in(stdin, stderr, peername, NULL);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	187 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	188
264 1e5e457dea18 comments and a small refactoring markus schnalke <meillo@marmaro.de> parents: 263 diff changeset	189 /* default mode if address args or -t is specified, or called as rmail */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	190 static void
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	191 mode_accept(address return_path, gchar full_sender_name, guint accept_flags,
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	192 char **addresses, int addr_cnt)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	193 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	194 /* accept message on stdin */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	195 accept_error err;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	196 message *msg = create_message();
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	197 gint i;
266 ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	198 pid_t pid;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	199
83 085d6cd44462 using is_privileged_user() to check here too meillo@marmaro.de parents: 76 diff changeset	200 if (return_path && !is_privileged_user(conf.orig_uid)) {
96 b76080154aec small typo fix meillo@marmaro.de parents: 89 diff changeset	201 fprintf(stderr, "must be root, %s or in group %s for setting return path.\n", DEF_MAIL_USER, DEF_MAIL_GROUP);
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	202 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	203 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	204
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	205 if (!conf.run_as_user) {
331 e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	206 set_euidgid(conf.orig_uid, conf.orig_gid, NULL, NULL);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	207 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	208
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	209 DEBUG(5) debugf("accepting message on stdin\n");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	210
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	211 msg->received_prot = PROT_LOCAL;
276 1abc1faeb45d for -t cmdline args are now added to the rcpt list instead of substracted markus schnalke <meillo@marmaro.de> parents: 268 diff changeset	212
1abc1faeb45d for -t cmdline args are now added to the rcpt list instead of substracted markus schnalke <meillo@marmaro.de> parents: 268 diff changeset	213 /* warn if -t option and cmdline addr args */
1abc1faeb45d for -t cmdline args are now added to the rcpt list instead of substracted markus schnalke <meillo@marmaro.de> parents: 268 diff changeset	214 if (addr_cnt && (accept_flags & ACC_RCPT_FROM_HEAD)) {
1abc1faeb45d for -t cmdline args are now added to the rcpt list instead of substracted markus schnalke <meillo@marmaro.de> parents: 268 diff changeset	215 logwrite(LOG_ALERT, "command line address arguments are now added to the mail header\\\n");
1abc1faeb45d for -t cmdline args are now added to the rcpt list instead of substracted markus schnalke <meillo@marmaro.de> parents: 268 diff changeset	216 logwrite(LOG_ALERT, " recipient addresses (instead of substracted) when -t is given.\\\n");
1abc1faeb45d for -t cmdline args are now added to the rcpt list instead of substracted markus schnalke <meillo@marmaro.de> parents: 268 diff changeset	217 logwrite(LOG_ALERT, " this changed with version 0.3.1\n");
1abc1faeb45d for -t cmdline args are now added to the rcpt list instead of substracted markus schnalke <meillo@marmaro.de> parents: 268 diff changeset	218 }
1abc1faeb45d for -t cmdline args are now added to the rcpt list instead of substracted markus schnalke <meillo@marmaro.de> parents: 268 diff changeset	219
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	220 for (i = 0; i < addr_cnt; i++) {
266 ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	221 if (addresses[i][0] == '\|') {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	222 logwrite(LOG_ALERT, "no pipe allowed as recipient address: %s\n", addresses[i]);
276 1abc1faeb45d for -t cmdline args are now added to the rcpt list instead of substracted markus schnalke <meillo@marmaro.de> parents: 268 diff changeset	223 /* should we better ignore this one addr? */
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	224 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	225 }
264 1e5e457dea18 comments and a small refactoring markus schnalke <meillo@marmaro.de> parents: 263 diff changeset	226 msg->rcpt_list = g_list_append(msg->rcpt_list, create_address_qualified(addresses[i], TRUE, conf.host_name));
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	227 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	228
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	229 /* -f option */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	230 msg->return_path = return_path;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	231
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	232 /* -F option */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	233 msg->full_sender_name = full_sender_name;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	234
266 ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	235 err = accept_message(stdin, msg, accept_flags);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	236
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	237 switch (err) {
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	238 case AERR_OK:
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	239 /* to continue; all other cases exit */
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	240 break;
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	241 case AERR_EOF:
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	242 fprintf(stderr, "unexpected EOF.\n");
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	243 exit(1);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	244 case AERR_NORCPT:
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	245 fprintf(stderr, "no recipients.\n");
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	246 exit(1);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	247 case AERR_SIZE:
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	248 fprintf(stderr, "max message size exceeded.\n");
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	249 exit(1);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	250 default:
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	251 /* should never happen: */
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	252 fprintf(stderr, "Unknown error (%d)\r\n", err);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	253 exit(1);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	254 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	255
266 ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	256 if (!spool_write(msg, TRUE)) {
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	257 fprintf(stderr, "Could not write spool file\n");
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	258 exit(1);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	259 }
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	260
267 8be687c06c20 comments (should we really exit failure in this case?) markus schnalke <meillo@marmaro.de> parents: 266 diff changeset	261 /* here the mail is queued and thus in our responsibility */
266 ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	262 logwrite(LOG_NOTICE, "%s <= %s with %s\n", msg->uid, addr_string(msg->return_path), prot_names[PROT_LOCAL]);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	263
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	264 if (conf.do_queue) {
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	265 /* we're finished as we only need to queue it */
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	266 return;
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	267 }
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	268
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	269 /* deliver at once */
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	270 if ((pid = fork()) < 0) {
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	271 logwrite(LOG_ALERT, "could not fork for delivery, id = %s\n", msg->uid);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	272 } else if (pid == 0) {
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	273 conf.do_verbose = FALSE;
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	274 fclose(stdin);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	275 fclose(stdout);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	276 fclose(stderr);
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	277 if (deliver(msg)) {
ab39047ffe44 refactored mode_accept() markus schnalke <meillo@marmaro.de> parents: 264 diff changeset	278 exit(0);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	279 } else {
267 8be687c06c20 comments (should we really exit failure in this case?) markus schnalke <meillo@marmaro.de> parents: 266 diff changeset	280 /*
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	281 ** TODO: Should we really fail here? Because the
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	282 ** mail is queued already. If we fail the client
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	283 ** might submit it again. If at-once-delivery
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	284 ** is seen as an additional best-effort service,
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	285 ** then we should still exit successful here.
267 8be687c06c20 comments (should we really exit failure in this case?) markus schnalke <meillo@marmaro.de> parents: 266 diff changeset	286 */
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	287 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	288 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	289 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	290 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	291
250 a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	292 /*
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	293 ** if -Mrm is given
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	294 **
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	295 ** currently only the `rm' command is supported
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	296 ** until this changes, we don't need any facility for further commands
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	297 ** return success if at least one message had been deleted
250 a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	298 */
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	299 static int
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 349 diff changeset	300 manipulate_queue(char cmd, char id[])
250 a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	301 {
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	302 gboolean ok = FALSE;
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	303
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	304 if (strcmp(cmd, "rm") != 0) {
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	305 fprintf(stderr, "unknown command %s\n", cmd);
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	306 return FALSE;
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	307 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	308
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	309 set_euidgid(conf.mail_uid, conf.mail_gid, NULL, NULL);
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	310
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	311 /* privileged users may delete any mail */
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	312 if (is_privileged_user(conf.orig_uid)) {
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	313 for (; *id; id++) {
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	314 fprintf(stderr, "id: %s\n", *id);
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	315 if (queue_delete(*id)) {
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	316 ok = TRUE;
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	317 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	318 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	319 return ok;
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	320 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	321
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	322 struct passwd *pw = getpwuid(conf.orig_uid);
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	323 if (!pw) {
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	324 fprintf(stderr, "could not find a passwd entry for uid %d: %s\n",
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	325 conf.orig_uid, strerror(errno));
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	326 return FALSE;
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	327 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	328
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	329 /* non-privileged users may only delete their own messages */
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	330 for (; *id; id++) {
349 b45dc53f2829 Removed unused second arg of msg_spool_read() markus schnalke <meillo@marmaro.de> parents: 331 diff changeset	331 message msg = msg_spool_read(id);
250 a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	332
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	333 fprintf(stderr, "id: %s\n", *id);
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	334
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	335 if (!msg->ident) {
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	336 fprintf(stderr, "message %s does not have an ident\n", *id);
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	337 continue;
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	338 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	339 if (strcmp(pw->pw_name, msg->ident) != 0) {
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	340 fprintf(stderr, "you do not own message id %s\n", *id);
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	341 continue;
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	342 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	343
378 5781ba87df95 Removed ident. This had been discussed on the mailing list in Oct 2011. markus schnalke <meillo@marmaro.de> parents: 367 diff changeset	344 if (msg->received_host \|\| (msg->received_prot != PROT_LOCAL)) {
5781ba87df95 Removed ident. This had been discussed on the mailing list in Oct 2011. markus schnalke <meillo@marmaro.de> parents: 367 diff changeset	345 fprintf(stderr, "message %s was not received locally\n", *id);
250 a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	346 continue;
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	347 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	348
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	349 ok = queue_delete(*id);
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	350 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	351 return ok;
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	352 }
a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	353
264 1e5e457dea18 comments and a small refactoring markus schnalke <meillo@marmaro.de> parents: 263 diff changeset	354 /* -qo, -q (without argument), or called as runq */
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	355 static int
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 349 diff changeset	356 run_queue(gboolean do_runq, gboolean do_runq_online, char *route_name)
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	357 {
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	358 int ret;
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	359
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	360 /* queue runs */
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	361 set_identity(conf.orig_uid, "queue run");
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	362
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	363 if (do_runq) {
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	364 ret = queue_run();
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	365 }
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	366
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	367 if (do_runq_online) {
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	368 if (route_name) {
310 f10a56dc7481 reworked online_detect to the simpler online_query meillo@marmaro.de parents: 290 diff changeset	369 conf.online_query = g_strdup_printf("/bin/echo %s", route_name);
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	370 }
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	371 /*
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	372 ** TODO: change behavior of `-qo without argument'?
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	373 ** Because that behavior is included in -q.
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	374 */
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	375 ret = queue_run_online();
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	376 }
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	377 return ret;
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	378 }
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	379
264 1e5e457dea18 comments and a small refactoring markus schnalke <meillo@marmaro.de> parents: 263 diff changeset	380 /* -bV or default mode if neither addr arg nor -t */
261 0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	381 static void
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	382 mode_version(void)
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	383 {
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	384 gchar *with_resolver = "";
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	385 gchar *with_auth = "";
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	386
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	387 #ifdef ENABLE_RESOLVER
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	388 with_resolver = " +resolver";
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	389 #endif
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	390 #ifdef ENABLE_AUTH
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	391 with_auth = " +auth";
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	392 #endif
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	393
378 5781ba87df95 Removed ident. This had been discussed on the mailing list in Oct 2011. markus schnalke <meillo@marmaro.de> parents: 367 diff changeset	394 printf("%s %s%s%s\n", PACKAGE, VERSION, with_resolver, with_auth);
261 0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	395 }
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	396
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	397 void
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	398 set_mode(enum mta_mode mode)
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	399 {
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	400 if (mta_mode && mta_mode!=mode) {
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	401 fprintf(stderr, "operation mode was already specified (%d vs. %d)\n", mta_mode, mode);
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	402 exit(1);
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	403 }
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	404
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	405 mta_mode = mode;
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	406 return;
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	407 }
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	408
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	409 int
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	410 main(int argc, char *argv[])
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	411 {
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	412 gchar *progname;
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 349 diff changeset	413 char *opt;
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	414 gint arg;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	415
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	416 gboolean do_listen = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	417 gboolean do_runq = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	418 gboolean do_runq_online = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	419 gboolean do_queue = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	420 gint queue_interval = 0;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	421 gchar *M_cmd = NULL;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	422 gboolean opt_t = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	423 gboolean opt_i = FALSE;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	424 gchar *conf_file = CONF_FILE;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	425 gchar *route_name = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	426 gchar *f_address = NULL;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	427 address return_path = NULL; / may be changed by -f option */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	428 gchar *full_sender_name = NULL;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	429 gboolean do_verbose = FALSE;
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	430 gint debug_level = -1;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	431
260 bd3109ec0f0a substituted get_progname() with a call to strrchr() markus schnalke <meillo@marmaro.de> parents: 259 diff changeset	432 /* strip the path part */
261 0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	433 progname = strrchr(argv[0], '/');
0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	434 progname = (progname) ? progname+1 : argv[0];
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	435
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	436 if (strcmp(progname, "mailq") == 0) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	437 mta_mode = MODE_LIST;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	438 } else if (strcmp(progname, "mailrm") == 0) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	439 mta_mode = MODE_MCMD;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	440 M_cmd = "rm";
284 4869321aa7bf recognize the program name `newaliases' too markus schnalke <meillo@marmaro.de> parents: 282 diff changeset	441 } else if (strcmp(progname, "newaliases") == 0) {
4869321aa7bf recognize the program name `newaliases' too markus schnalke <meillo@marmaro.de> parents: 282 diff changeset	442 mta_mode = MODE_BI;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	443 } else if (strcmp(progname, "rmail") == 0) {
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	444 /*
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	445 ** the `rmail' alias should probably be removed now
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	446 ** that we have the rmail script. But let's keep it
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	447 ** for some while for compatibility. 2010-06-19
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	448 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	449 mta_mode = MODE_ACCEPT;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	450 opt_i = TRUE;
284 4869321aa7bf recognize the program name `newaliases' too markus schnalke <meillo@marmaro.de> parents: 282 diff changeset	451 } else if (strcmp(progname, "runq") == 0) {
4869321aa7bf recognize the program name `newaliases' too markus schnalke <meillo@marmaro.de> parents: 282 diff changeset	452 mta_mode = MODE_RUNQUEUE;
4869321aa7bf recognize the program name `newaliases' too markus schnalke <meillo@marmaro.de> parents: 282 diff changeset	453 do_runq = TRUE;
4869321aa7bf recognize the program name `newaliases' too markus schnalke <meillo@marmaro.de> parents: 282 diff changeset	454 } else if (strcmp(progname, "smtpd") == 0
4869321aa7bf recognize the program name `newaliases' too markus schnalke <meillo@marmaro.de> parents: 282 diff changeset	455 \|\| strcmp(progname, "in.smtpd") == 0) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	456 mta_mode = MODE_SMTP;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	457 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	458
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	459 /* parse cmd line */
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	460 for (arg=1; arg<argc && argv[arg][0]=='-'; arg++) {
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	461 opt = argv[arg] + 1; /* points to the char after the dash */
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	462
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	463 if (strcmp(opt, "-") == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	464 /* everything after `--' are address arguments */
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	465 arg++;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	466 break;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	467
278 c35c59a36a2a added -bm for mode accept (the other MTAs have it too) markus schnalke <meillo@marmaro.de> parents: 276 diff changeset	468 } else if (strcmp(opt, "bm") == 0) {
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	469 set_mode(MODE_ACCEPT);
278 c35c59a36a2a added -bm for mode accept (the other MTAs have it too) markus schnalke <meillo@marmaro.de> parents: 276 diff changeset	470
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	471 } else if (strcmp(opt, "bd") == 0) {
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	472 set_mode(MODE_DAEMON);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	473 do_listen = TRUE;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	474
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	475 } else if (strcmp(opt, "bi") == 0) {
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	476 set_mode(MODE_BI);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	477
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	478 } else if (strcmp(opt, "bs") == 0) {
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	479 set_mode(MODE_SMTP);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	480
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	481 } else if (strcmp(opt, "bp") == 0) {
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	482 set_mode(MODE_LIST);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	483
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	484 } else if (strcmp(opt, "bV") == 0) {
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	485 set_mode(MODE_VERSION);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	486
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	487 } else if (strncmp(opt, "B", 1) == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	488 /* we ignore this and throw the argument away */
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	489 get_optarg(argv, &arg, opt+1);
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	490
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	491 } else if (strncmp(opt, "C", 1) == 0) {
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	492 conf_file = get_optarg(argv, &arg, opt+1);
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	493 if (!conf_file) {
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	494 fprintf(stderr, "-C requires a filename as argument.\n");
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	495 exit(1);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	496 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	497
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	498 } else if (strncmp(opt, "d", 1) == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	499 if (getuid() != 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	500 fprintf(stderr, "only root may set the debug level.\n");
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	501 exit(1);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	502 }
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	503 char *lvl = get_optarg(argv, &arg, opt+1);
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	504 if (!lvl) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	505 fprintf(stderr, "-d requires a number argument.\n");
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	506 exit(1);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	507 }
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	508 debug_level = atoi(lvl);
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	509
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	510 } else if (strncmp(opt, "f", 1) == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	511 /* set return path */
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	512 gchar *address = get_optarg(argv, &arg, opt+1);
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	513 if (!address) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	514 fprintf(stderr, "-f requires an address argument\n");
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	515 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	516 }
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	517 f_address = g_strdup(address);
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	518
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	519 } else if (strncmp(opt, "F", 1) == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	520 full_sender_name = get_optarg(argv, &arg, opt+1);
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	521 if (!full_sender_name) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	522 fprintf(stderr, "-F requires a name argument\n");
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	523 exit(1);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	524 }
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	525
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	526 } else if (strcmp(opt, "i") == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	527 opt_i = TRUE;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	528
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	529 } else if (strcmp(opt, "m") == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	530 /* ignore -m (me too) switch (see man page) */
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	531
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	532 } else if (strcmp(opt, "Mrm") == 0) {
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	533 set_mode(MODE_MCMD);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	534 M_cmd = "rm";
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	535
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	536 } else if (strcmp(opt, "odq") == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	537 do_queue = TRUE;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	538
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	539 } else if (strcmp(opt, "oi") == 0) {
257 8cca5305e4f0 fixed -oi to really be the same as -i markus schnalke <meillo@marmaro.de> parents: 254 diff changeset	540 opt_i = TRUE;
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	541
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	542 } else if (strncmp(opt, "o", 1) == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	543 /* ignore all other -oXXX options */
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	544
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	545 } else if (strncmp(opt, "qo", 2) == 0) {
278 c35c59a36a2a added -bm for mode accept (the other MTAs have it too) markus schnalke <meillo@marmaro.de> parents: 276 diff changeset	546 /* must be before the `q' check */
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	547 set_mode(MODE_RUNQUEUE);
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	548 do_runq_online = TRUE;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	549 /* can be NULL, then we use online detection method */
290 792e0201c1b3 mark -qo (without argument) obsolete markus schnalke <meillo@marmaro.de> parents: 288 diff changeset	550 /* TODO: behavior might change if it is NULL */
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	551 route_name = get_optarg(argv, &arg, opt+2);
290 792e0201c1b3 mark -qo (without argument) obsolete markus schnalke <meillo@marmaro.de> parents: 288 diff changeset	552 if (!route_name) {
792e0201c1b3 mark -qo (without argument) obsolete markus schnalke <meillo@marmaro.de> parents: 288 diff changeset	553 fprintf(stderr, "Please do not use -qo without argument anymore; use -q instead.\n");
792e0201c1b3 mark -qo (without argument) obsolete markus schnalke <meillo@marmaro.de> parents: 288 diff changeset	554 fprintf(stderr, "The behavior for -qo without argument is likely to change.\n");
792e0201c1b3 mark -qo (without argument) obsolete markus schnalke <meillo@marmaro.de> parents: 288 diff changeset	555 }
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	556
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	557 } else if (strncmp(opt, "q", 1) == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	558 /* must be after the `qo' check */
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	559 gchar *optarg;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	560
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	561 optarg = get_optarg(argv, &arg, opt+1);
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	562 if (optarg) {
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	563 /* not just one single queue run but regular runs */
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	564 set_mode(MODE_DAEMON);
254 82d168dd52fd removed the obsolete pos argument from time_interval() markus schnalke <meillo@marmaro.de> parents: 251 diff changeset	565 queue_interval = time_interval(optarg);
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	566 } else {
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	567 set_mode(MODE_RUNQUEUE);
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	568 do_runq = TRUE;
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	569 }
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	570
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	571 } else if (strcmp(opt, "t") == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	572 opt_t = TRUE;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	573
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	574 } else if (strcmp(opt, "v") == 0) {
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	575 do_verbose = TRUE;
f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	576
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	577 } else {
249 f9da5a7caeda refactored the cmdline argument processing markus schnalke <meillo@marmaro.de> parents: 248 diff changeset	578 fprintf(stderr, "unrecognized option `-%s'\n", opt);
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	579 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	580 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	581 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	582
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	583 if (!mta_mode && arg==argc && !opt_t) {
278 c35c59a36a2a added -bm for mode accept (the other MTAs have it too) markus schnalke <meillo@marmaro.de> parents: 276 diff changeset	584 /*
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	585 ** In this case no rcpts can be found, thus no mail
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	586 ** can be sent, thus masqmail will always fail. We
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	587 ** rather do something better instead. This covers
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	588 ** also the case of calling masqmail without args.
278 c35c59a36a2a added -bm for mode accept (the other MTAs have it too) markus schnalke <meillo@marmaro.de> parents: 276 diff changeset	589 */
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	590 mode_version();
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	591 exit(0);
259 f4117fd5a163 made default mode sensible markus schnalke <meillo@marmaro.de> parents: 258 diff changeset	592 }
f4117fd5a163 made default mode sensible markus schnalke <meillo@marmaro.de> parents: 258 diff changeset	593
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	594 if (mta_mode == MODE_VERSION) {
261 0afe18a9ee03 fixed previous commit and excluded mode_version() from main() markus schnalke <meillo@marmaro.de> parents: 260 diff changeset	595 mode_version();
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	596 exit(0);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	597 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	598
281 ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	599 if (!mta_mode) {
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	600 mta_mode = MODE_ACCEPT;
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	601 }
ea5f86e0a81c modes are now enforced exclusive markus schnalke <meillo@marmaro.de> parents: 278 diff changeset	602
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	603 /* initialize random generator */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	604 srand(time(NULL));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	605 /* ignore SIGPIPE signal */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	606 signal(SIGPIPE, SIG_IGN);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	607
73 9db75b801dc4 made a comment more exact meillo@marmaro.de parents: 72 diff changeset	608 /* close all possibly open file descriptors, except std{in,out,err} */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	609 {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	610 int i, max_fd = sysconf(_SC_OPEN_MAX);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	611
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	612 if (max_fd <= 0) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	613 max_fd = 64;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	614 }
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	615 for (i=3; i<max_fd; i++) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	616 close(i);
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	617 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	618 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	619
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	620 init_conf();
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	621
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	622 /*
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	623 ** if we are not privileged, and the config file was changed we
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	624 ** implicetely set the the run_as_user flag and give up all
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	625 ** privileges.
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	626 **
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	627 ** So it is possible for a user to run his own daemon without
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	628 ** breaking security.
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	629 */
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	630 if ((strcmp(conf_file, CONF_FILE) != 0) && (conf.orig_uid != 0)) {
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	631 conf.run_as_user = TRUE;
331 e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	632 set_euidgid(conf.orig_uid, conf.orig_gid, NULL, NULL);
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	633 if (setgid(conf.orig_gid)) {
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	634 logwrite(LOG_ALERT, "could not set gid to %d: %s\n", conf.orig_gid, strerror(errno));
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	635 exit(1);
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	636 }
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	637 if (setuid(conf.orig_uid)) {
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	638 logwrite(LOG_ALERT, "could not set uid to %d: %s\n", conf.orig_uid, strerror(errno));
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	639 exit(1);
e507c854a63e Security fix! Correct handling of seteuid() return value markus schnalke <meillo@marmaro.de> parents: 310 diff changeset	640 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	641 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	642
155 b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 117 diff changeset	643 conf.log_dir = LOG_DIR;
288 84ea0b1fc8f8 FIXME comment: where to log while reading the config file? markus schnalke <meillo@marmaro.de> parents: 284 diff changeset	644 /* FIXME: fails if we run as user */
155 b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 117 diff changeset	645 logopen();
b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 117 diff changeset	646 if (!read_conf(conf_file)) {
b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 117 diff changeset	647 logwrite(LOG_ALERT, "SHUTTING DOWN due to problems reading config\n");
b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 117 diff changeset	648 exit(5);
b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 117 diff changeset	649 }
b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 117 diff changeset	650 logclose();
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	651
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	652 if (do_queue) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	653 conf.do_queue = TRUE;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	654 }
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	655 if (do_verbose) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	656 conf.do_verbose = TRUE;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	657 }
2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	658 if (debug_level >= 0) { /* if >= 0, it was given by argument */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	659 conf.debug_level = debug_level;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	660 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	661
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	662 /*
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	663 ** It appears that changing to / ensures that we are never in
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	664 ** a directory which we cannot access. This situation could be
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	665 ** possible after changing identity.
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	666 ** Maybe we should only change to / if we not run as user, to
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	667 ** allow relative paths for log files in test setups for
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	668 ** instance.
46 3cb6f383f07e fixed tests/local.sh meillo@marmaro.de parents: 12 diff changeset	669 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	670 chdir("/");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	671
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	672 if (!conf.run_as_user) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	673 if (setgid(0) != 0) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	674 fprintf(stderr, "could not set gid to 0. Is the setuid bit set? : %s\n", strerror(errno));
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	675 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	676 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	677 if (setuid(0) != 0) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	678 fprintf(stderr, "could not gain root privileges. Is the setuid bit set? : %s\n", strerror(errno));
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	679 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	680 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	681 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	682
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	683 if (!logopen()) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	684 fprintf(stderr, "could not open log file\n");
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	685 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	686 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	687
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	688 DEBUG(1) debugf("masqmail %s starting\n", VERSION);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	689
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	690 DEBUG(5) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	691 gchar **str = argv;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	692 debugf("args: \n");
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	693 while (*str) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	694 debugf("%s \n", *str);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	695 str++;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	696 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	697 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	698 DEBUG(5) debugf("queue_interval = %d\n", queue_interval);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	699
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	700 if (f_address) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	701 return_path = create_address_qualified(f_address, TRUE, conf.host_name);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	702 g_free(f_address);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	703 if (!return_path) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	704 fprintf(stderr, "invalid RFC821 address: %s\n", f_address);
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	705 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	706 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	707 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	708
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	709 switch (mta_mode) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	710 case MODE_DAEMON:
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	711 mode_daemon(do_listen, queue_interval, argv);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	712 break;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	713
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	714 case MODE_RUNQUEUE:
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	715 exit(run_queue(do_runq, do_runq_online, route_name) ? 0 : 1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	716 break;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	717
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	718 case MODE_SMTP:
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	719 mode_smtp();
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	720 break;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	721
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	722 case MODE_LIST:
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	723 queue_list();
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	724 break;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	725
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	726 case MODE_BI:
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 261 diff changeset	727 exit(0);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	728 break; /* well... */
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	729
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	730 case MODE_MCMD:
250 a41c013c8458 moved the queue manipulation code to an new function markus schnalke <meillo@marmaro.de> parents: 249 diff changeset	731 exit(manipulate_queue(M_cmd, &argv[arg]) ? 0 : 1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	732 break;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	733
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	734 case MODE_ACCEPT:
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	735 {
268 7b12d081b939 removed ACC_DEL_RCPTS because it's always used with ACC_RCPT_FROM_HEAD markus schnalke <meillo@marmaro.de> parents: 267 diff changeset	736 guint accept_flags = (opt_t ? ACC_RCPT_FROM_HEAD : 0)
110 c678d0342451 changed name ACC_NODOT_TERM to ACC_DOT_IGNORE for better understanding meillo@marmaro.de parents: 107 diff changeset	737 \| (opt_i ? ACC_DOT_IGNORE : ACC_NODOT_RELAX);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	738 mode_accept(return_path, full_sender_name, accept_flags, &(argv[arg]), argc - arg);
258 05fa719b7002 fixed -oem by removing it ;-) markus schnalke <meillo@marmaro.de> parents: 257 diff changeset	739 exit(0);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	740 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	741 break;
251 2babd21e7c75 moved run_queue to a new function markus schnalke <meillo@marmaro.de> parents: 250 diff changeset	742
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	743 default:
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	744 fprintf(stderr, "unknown mode: %d\n", mta_mode);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	745 break;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	746 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	747
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	748 logclose();
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	749
263 e9e73505ab2c removed now obsolete exit_code markus schnalke <meillo@marmaro.de> parents: 262 diff changeset	750 exit(0);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	751 }

Mercurial > masqmail

annotate src/masqmail.c @ 392:c5fd796ea06e