masqmail: src/conf.c annotate

annotate src/conf.c @ 391:0ca270ca11fa

Refactoring and code layouting.

author	markus schnalke <meillo@marmaro.de>
date	Sat, 18 Feb 2012 17:53:04 +0100
parents	a408411ff8df
children	c5fd796ea06e

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
13 49dab67fe461 code beautifying meillo@marmaro.de parents: 10 diff changeset	21 #include <pwd.h>
49dab67fe461 code beautifying meillo@marmaro.de parents: 10 diff changeset	22 #include <grp.h>
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	23
13 49dab67fe461 code beautifying meillo@marmaro.de parents: 10 diff changeset	24 #include "masqmail.h"
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	25
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	26 masqmail_conf conf;
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	27
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	28 void
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	29 init_conf()
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	30 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	31 struct passwd *passwd;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	32 struct group *group;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	33
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	34 memset(&conf, 0, sizeof(masqmail_conf));
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	35
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	36 conf.orig_uid = getuid();
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	37 conf.orig_gid = getgid();
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	38
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	39 if ((passwd = getpwnam(DEF_MAIL_USER)))
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	40 conf.mail_uid = passwd->pw_uid;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	41 else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	42 fprintf(stderr, "user %s not found! (terminating)\n", DEF_MAIL_USER);
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 254 diff changeset	43 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	44 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	45 if ((group = getgrnam(DEF_MAIL_GROUP)))
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	46 conf.mail_gid = group->gr_gid;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	47 else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	48 fprintf(stderr, "group %s not found! (terminating)\n", DEF_MAIL_GROUP);
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 254 diff changeset	49 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	50 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	51 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	52
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	53 static gchar *true_strings[] = {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	54 "yes", "on", "true", NULL
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
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	57 static gchar *false_strings[] = {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	58 "no", "off", "false", NULL
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	59 };
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	60
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	61 static gboolean
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	62 parse_boolean(gchar *rval)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	63 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	64 gchar **str;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	65
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	66 DEBUG(9) fprintf(stderr, "parse_boolean: %s\n", rval);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	67
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	68 str = true_strings;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	69 while (*str) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	70 if (strncasecmp(str, rval, strlen(str)) == 0)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	71 return TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	72 str++;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	73 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	74
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	75 str = false_strings;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	76 while (*str) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	77 if (strncasecmp(str, rval, strlen(str)) == 0)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	78 return FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	79 str++;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	80 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	81
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	82 fprintf(stderr, "cannot parse value '%s'\n", rval);
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 254 diff changeset	83 exit(1);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	84 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	85
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	86 /* make a list from each line in a file */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	87 static GList*
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	88 parse_list_file(gchar *fname)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	89 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	90 GList *list = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	91 FILE *fptr;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	92
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	93 if ((fptr = fopen(fname, "rt")) == NULL) {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	94 logwrite(LOG_ALERT, "could not open %s for reading: %s\n", fname, strerror(errno));
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 254 diff changeset	95 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	96 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	97
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	98 gchar buf[256];
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	99
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	100 while (!feof(fptr)) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	101 fgets(buf, 255, fptr);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	102 if (buf[0] && (buf[0] != '#') && (buf[0] != '\n')) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	103 g_strchomp(buf);
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	104 DEBUG(9) fprintf(stderr,"parse_list_file: item = %s\n", buf);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	105 list = g_list_append(list, g_strdup(buf));
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	106 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	107 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	108 fclose(fptr);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	109
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	110 return list;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	111 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	112
13 49dab67fe461 code beautifying meillo@marmaro.de parents: 10 diff changeset	113 /* given a semicolon separated string, this function makes a GList out of it. */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	114 GList*
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	115 parse_list(gchar *line, gboolean read_file)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	116 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	117 GList *list = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	118 gchar buf[256];
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	119 gchar p, q;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	120
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	121 DEBUG(9) fprintf(stderr, "parsing list %s, file?:%d\n", line, read_file);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	122
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	123 p = line;
14 a8f3424347dc replaced number 0 with character \0 where appropriate meillo@marmaro.de parents: 13 diff changeset	124 while (*p != '\0') {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	125 q = buf;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	126
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	127 while (p && (p != ';') && (q < buf + 255))
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	128 (q++) = (p++);
14 a8f3424347dc replaced number 0 with character \0 where appropriate meillo@marmaro.de parents: 13 diff changeset	129 *q = '\0';
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	130
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	131 if ((buf[0] == '/') && (read_file))
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	132 /* item is a filename, include its contents */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	133 list = g_list_concat(list, parse_list_file(buf));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	134 else
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	135 /* just a normal item */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	136 list = g_list_append(list, g_strdup(buf));
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	137
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	138 DEBUG(9) fprintf(stderr, "item = %s\n", buf);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	139
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	140 if (*p)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	141 p++;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	142 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	143 return list;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	144 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	145
367 b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	146 /*
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	147 ** Split the addrs at '@' into local_part and domain. Without an '@'
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	148 ** everything is local_part. Create address structs, which are put into a
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	149 ** list and returned. This funktion is used for lists of addrs containing
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	150 ** globbing chars (* and ?). We don't need valid RFC821 addresses here,
b27f66555ba8 Reformated multiline comments to have leading asterisks on each line markus schnalke <meillo@marmaro.de> parents: 366 diff changeset	151 ** just patterns to match against.
317 55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	152 */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	153 static GList*
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	154 parse_address_glob_list(gchar *line, gboolean read_file)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	155 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	156 GList *plain_list = parse_list(line, read_file);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	157 GList *node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	158 GList *list = NULL;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	159
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	160 foreach(plain_list, node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	161 gchar item = (gchar ) (node->data);
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	162 char *at;
41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	163 char *p;
317 55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	164 address *addr = calloc(1, sizeof(address));
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	165
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	166 for (p=item+strlen(item)-1; isspace(p) \|\| p=='>'; p--) {
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	167 *p = '\0';
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	168 }
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	169 for (p=item; isspace(p) \|\| p=='<'; p++) {
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	170 }
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	171
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	172 addr->address = strdup(p);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	173 at = strrchr(p, '@');
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	174 if (at) {
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	175 *at = '\0';
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	176 addr->local_part = strdup(p);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	177 addr->domain = strdup(at+1);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	178 } else {
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	179 addr->local_part = strdup(p);
330 f899ca0835a8 Fixed local-part only address patterns in route conditions markus schnalke <meillo@marmaro.de> parents: 329 diff changeset	180 /* No `@', thus any domain is okay. */
f899ca0835a8 Fixed local-part only address patterns in route conditions markus schnalke <meillo@marmaro.de> parents: 329 diff changeset	181 addr->domain = "*";
317 55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	182 }
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	183 list = g_list_append(list, addr);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	184 DEBUG(6) debugf("parse_address_glob_list: read pattern `%s' `%s'\n",
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	185 addr->local_part, addr->domain);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	186 g_free(item);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	187 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	188 g_list_free(plain_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	189 return list;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	190 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	191
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	192 static GList*
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	193 parse_resolve_list(gchar *line)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	194 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	195 GList *list;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	196 GList *list_node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	197 GList *res_list = NULL;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	198
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	199 list = parse_list(line, FALSE);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	200 if (!list) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	201 return NULL;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	202 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	203
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	204 foreach(list, list_node) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	205 gchar item = (gchar ) (list_node->data);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	206 if (strcmp(item, "byname") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	207 res_list = g_list_append(res_list, resolve_byname);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	208 #ifdef ENABLE_RESOLVER
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	209 } else if (strcmp(item, "dns_a") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	210 res_list = g_list_append(res_list, resolve_dns_a);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	211 } else if (strcmp(item, "dns_mx") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	212 res_list = g_list_append(res_list, resolve_dns_mx);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	213 #endif
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	214 } else {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	215 logwrite(LOG_ALERT, "unknown resolver %s\n", item);
262 fc1c6425c024 s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ markus schnalke <meillo@marmaro.de> parents: 254 diff changeset	216 exit(1);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	217 }
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	218 g_free(item);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	219 }
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	220 g_list_free(list);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	221 return res_list;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	222 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	223
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	224 static interface*
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	225 parse_interface(gchar *line, gint def_port)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	226 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	227 gchar buf[256];
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	228 gchar p, q;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	229 interface *iface;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	230
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	231 DEBUG(9) fprintf(stderr, "parse_interface: %s\n", line);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	232
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	233 p = line;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	234 q = buf;
14 a8f3424347dc replaced number 0 with character \0 where appropriate meillo@marmaro.de parents: 13 diff changeset	235 while ((p != '\0') && (p != ':') && (q < buf + 255))
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	236 (q++) = (p++);
14 a8f3424347dc replaced number 0 with character \0 where appropriate meillo@marmaro.de parents: 13 diff changeset	237 *q = '\0';
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	238
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	239 iface = g_malloc(sizeof(interface));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	240 iface->address = g_strdup(buf);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	241
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	242 if (*p) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	243 p++;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	244 iface->port = atoi(p);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	245 } else
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	246 iface->port = def_port;
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	247 DEBUG(9) fprintf(stderr,"rval=%s, address:port=%s:%i\n",line, iface->address, iface->port);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	248
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	249 return iface;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	250 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	251
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	252 static gboolean
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	253 eat_comments(FILE *in)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	254 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	255 gint c;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	256
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	257 for (c = fgetc(in); (c == '#' \|\| isspace(c)) && c != EOF;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	258 c = fgetc(in)) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	259 if (c == '#') {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	260 gint c;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	261 for (c = fgetc(in); (c != '\n') && (c != EOF); c = fgetc(in));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	262 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	263 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	264 if (c == EOF)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	265 return FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	266 ungetc(c, in);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	267 return TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	268 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	269
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	270 /* after parsing, eat trailing character until LF */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	271 static gboolean
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	272 eat_line_trailing(FILE *in)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	273 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	274 gint c;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	275
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	276 for (c = fgetc(in); c != EOF && c != '\n'; c = fgetc(in));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	277 if (c == EOF)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	278 return FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	279 return TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	280 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	281
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	282 static gboolean
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	283 eat_spaces(FILE *in)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	284 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	285 gint c;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	286
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	287 for (c = fgetc(in); c != EOF && isspace(c); c = fgetc(in)) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	288 /* empty */
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	289 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	290 if (c == EOF)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	291 return FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	292 ungetc(c, in);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	293 return TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	294 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	295
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	296 static gboolean
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	297 read_lval(FILE in, gchar buf, gint size)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	298 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	299 gint c;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	300 gchar *ptr = buf;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	301
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	302 DEBUG(9) fprintf(stderr, "read_lval()\n");
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	303
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	304 if (!eat_spaces(in))
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	305 return FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	306
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	307 c = fgetc(in);
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	308 DEBUG(9) fprintf(stderr, "read_lval() 2\n");
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	309 while ((isalnum(c) \|\| c == '_' \|\| c == '-' \|\| c == '.')
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	310 && (ptr < buf + size - 1)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	311 && (c != EOF)) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	312 *ptr = c;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	313 ptr++;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	314 c = fgetc(in);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	315 }
14 a8f3424347dc replaced number 0 with character \0 where appropriate meillo@marmaro.de parents: 13 diff changeset	316 *ptr = '\0';
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	317 ungetc(c, in);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	318
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	319 if (c == EOF) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	320 fprintf(stderr, "unexpected EOF after %s\n", buf);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	321 return FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	322 } else if (ptr >= buf + size - 1) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	323 fprintf(stderr, "lval too long\n");
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	324 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	325
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	326 eat_spaces(in);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	327
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	328 DEBUG(9) fprintf(stderr, "lval = %s\n", buf);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	329
14 a8f3424347dc replaced number 0 with character \0 where appropriate meillo@marmaro.de parents: 13 diff changeset	330 return buf[0] != '\0';
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	331 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	332
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	333 static gboolean
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	334 read_rval(FILE in, gchar buf, gint size)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	335 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	336 gint c;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	337 gchar *ptr = buf;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	338
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	339 DEBUG(9) fprintf(stderr, "read_rval()\n");
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	340
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	341 if (!eat_spaces(in))
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	342 return FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	343
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	344 c = fgetc(in);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	345 if (c != '\"') {
115 315773f814f7 allow `:' unquoted too; updated masqmail.conf.5 (Thanks to Paolo) meillo@marmaro.de parents: 114 diff changeset	346 while ((isalnum(c) \|\| c == '_' \|\| c == '-' \|\| c == '.'
315773f814f7 allow `:' unquoted too; updated masqmail.conf.5 (Thanks to Paolo) meillo@marmaro.de parents: 114 diff changeset	347 \|\| c == '/' \|\| c == '@' \|\| c == ';' \|\| c == ':')
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	348 && (ptr < buf + size - 1)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	349 && (c != EOF)) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	350 *ptr = c;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	351 ptr++;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	352 c = fgetc(in);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	353 }
14 a8f3424347dc replaced number 0 with character \0 where appropriate meillo@marmaro.de parents: 13 diff changeset	354 *ptr = '\0';
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	355 ungetc(c, in);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	356 } else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	357 gboolean escape = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	358 c = fgetc(in);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	359 while (((c != '\"') \|\| escape) && (ptr < buf + size - 1)) {
13 49dab67fe461 code beautifying meillo@marmaro.de parents: 10 diff changeset	360 if (c != '\n') { /* ignore line breaks */
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	361 if ((c == '\\') && (!escape)) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	362 escape = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	363 } else {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	364 *ptr = c;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	365 ptr++;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	366 escape = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	367 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	368 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	369 c = fgetc(in);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	370 }
14 a8f3424347dc replaced number 0 with character \0 where appropriate meillo@marmaro.de parents: 13 diff changeset	371 *ptr = '\0';
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	372 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	373
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	374 eat_line_trailing(in);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	375
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	376 DEBUG(9) fprintf(stderr, "rval = %s\n", buf);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	377
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	378 return TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	379 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	380
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	381 static gboolean
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	382 read_statement(FILE in, gchar lval, gint lsize, gchar *rval, gint rsize)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	383 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	384 gint c;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	385
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	386 DEBUG(9) fprintf(stderr, "read_statement()\n");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	387
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	388 /* eat comments and empty lines: */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	389 if (!eat_comments(in))
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	390 return FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	391
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	392 if (!read_lval(in, lval, lsize)) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	393 return FALSE;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	394 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	395
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	396 DEBUG(9) fprintf(stderr, " lval = %s\n", lval);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	397 if ((c = fgetc(in) == '=')) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	398 if (read_rval(in, rval, rsize)) {
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	399 DEBUG(9) fprintf(stderr, " rval = %s\n", rval);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	400 return TRUE;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	401 }
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	402 } else {
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	403 DEBUG(9) fprintf(stderr," '=' expected after %s, char was '%c'\n", lval, c);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	404 fprintf(stderr, "'=' expected after %s, char was '%c'\n", lval, c);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	405 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	406 return FALSE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	407 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	408
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	409 gboolean
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	410 read_conf(gchar *filename)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	411 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	412 FILE *in;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	413
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	414 conf.log_max_pri = 7;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	415 conf.do_relay = TRUE;
244 7082044c05c6 renamed `alias_local_cmp' to `localpartcmp' markus schnalke <meillo@marmaro.de> parents: 243 diff changeset	416 conf.localpartcmp = strcmp;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	417 conf.max_defer_time = 86400 * 4; /* 4 days */
120 cd59a5b4d3dd added support for SMTP SIZE 0 (unlimited) meillo@marmaro.de parents: 117 diff changeset	418 conf.max_msg_size = 0; /* no limit on msg size */
151 e20fe8c9936a default values for logdir and spooldir meillo@marmaro.de parents: 131 diff changeset	419 conf.spool_dir = SPOOL_DIR;
152 dfb6143e7832 mail_dir defaults to /var/mail now meillo@marmaro.de parents: 151 diff changeset	420 conf.mail_dir = "/var/mail";
329 5ce2b1280679 Switched back from 127.0.0.1 to localhost markus schnalke <meillo@marmaro.de> parents: 319 diff changeset	421 conf.listen_addresses = g_list_append(NULL, parse_interface("localhost", 25));
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	422
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	423 if ((in = fopen(filename, "r")) == NULL) {
155 b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 153 diff changeset	424 logwrite(LOG_ALERT, "could not open config file %s: %s\n", filename, strerror(errno));
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	425 return FALSE;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	426 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	427
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	428 gchar lval[256], rval[2048];
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	429 while (read_statement(in, lval, 256, rval, 2048)) {
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	430 DEBUG(9) fprintf(stderr,"read_conf(): lval=%s\n", lval);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	431 if (strcmp(lval, "debug_level") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	432 conf.debug_level = atoi(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	433 else if (strcmp(lval, "run_as_user") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	434 if (!conf.run_as_user) /* you should not be able to reset that flag */
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	435 conf.run_as_user = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	436 } else if (strcmp(lval, "use_syslog") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	437 conf.use_syslog = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	438 else if (strcmp(lval, "mail_dir") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	439 conf.mail_dir = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	440 else if (strcmp(lval, "lock_dir") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	441 conf.lock_dir = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	442 else if (strcmp(lval, "spool_dir") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	443 conf.spool_dir = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	444 else if (strcmp(lval, "log_dir") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	445 conf.log_dir = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	446 else if (strcmp(lval, "host_name") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	447 if (rval[0] != '/')
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	448 conf.host_name = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	449 else {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	450 char buf[256];
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	451 FILE *fptr = fopen(rval, "rt");
307 e0de950ed497 bug fix: inverted condition meillo@marmaro.de parents: 262 diff changeset	452 if (!fptr) {
155 b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 153 diff changeset	453 logwrite(LOG_ALERT, "could not open %s: %s\n", rval, strerror(errno));
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	454 return FALSE;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	455 }
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	456 fgets(buf, 255, fptr);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	457 g_strchomp(buf);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	458 conf.host_name = g_strdup(buf);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	459 fclose(fptr);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	460 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	461 } else if (strcmp(lval, "local_hosts") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	462 conf.local_hosts = parse_list(rval, FALSE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	463 else if (strcmp(lval, "local_addresses") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	464 conf.local_addresses = parse_list(rval, TRUE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	465 else if (strcmp(lval, "not_local_addresses") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	466 conf.not_local_addresses = parse_list(rval, TRUE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	467 else if (strcmp(lval, "do_save_envelope_to") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	468 conf.do_save_envelope_to = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	469 else if (strcmp(lval, "defer_all") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	470 conf.defer_all = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	471 else if (strcmp(lval, "do_relay") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	472 conf.do_relay = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	473 else if (strcmp(lval, "alias_file") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	474 conf.alias_file = g_strdup(rval);
387 a408411ff8df Added a glob-pattern aliasing facility. markus schnalke <meillo@marmaro.de> parents: 378 diff changeset	475 } else if (strcmp(lval, "globalias_file") == 0) {
a408411ff8df Added a glob-pattern aliasing facility. markus schnalke <meillo@marmaro.de> parents: 378 diff changeset	476 conf.globalias_file = g_strdup(rval);
243 e758296de02d renamed `alias_local_caseless' to `caseless_matching' markus schnalke <meillo@marmaro.de> parents: 234 diff changeset	477 } else if (strcmp(lval, "caseless_matching") == 0) {
244 7082044c05c6 renamed `alias_local_cmp' to `localpartcmp' markus schnalke <meillo@marmaro.de> parents: 243 diff changeset	478 conf.localpartcmp = parse_boolean(rval) ? strcasecmp : strcmp;
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	479 } else if (strcmp(lval, "mbox_default") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	480 conf.mbox_default = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	481 } else if (strcmp(lval, "mbox_users") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	482 conf.mbox_users = parse_list(rval, TRUE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	483 } else if (strcmp(lval, "mda_users") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	484 conf.mda_users = parse_list(rval, TRUE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	485 } else if (strcmp(lval, "mda") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	486 conf.mda = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	487 } else if (strcmp(lval, "mda_fromline") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	488 conf.mda_fromline = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	489 } else if (strcmp(lval, "mda_fromhack") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	490 conf.mda_fromhack = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	491 } else if (strcmp(lval, "pipe_fromline") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	492 conf.pipe_fromline = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	493 } else if (strcmp(lval, "pipe_fromhack") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	494 conf.pipe_fromhack = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	495 } else if (strcmp(lval, "listen_addresses") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	496 GList *node;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	497 GList *tmp_list = parse_list(rval, FALSE);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	498
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	499 conf.listen_addresses = NULL;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	500 foreach(tmp_list, node) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	501 conf.listen_addresses = g_list_append(conf.listen_addresses, parse_interface((gchar *) (node-> data), 25));
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	502 g_free(node->data);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	503 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	504 g_list_free(tmp_list);
354 08932c629849 reworked the route concept; removed the idea of the localnet markus schnalke <meillo@marmaro.de> parents: 333 diff changeset	505 } else if (strncmp(lval, "query_routes.", 13) == 0) {
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	506 GList *file_list = parse_list(rval, FALSE);
354 08932c629849 reworked the route concept; removed the idea of the localnet markus schnalke <meillo@marmaro.de> parents: 333 diff changeset	507 table_pair *pair = create_pair(lval+13, file_list);
08932c629849 reworked the route concept; removed the idea of the localnet markus schnalke <meillo@marmaro.de> parents: 333 diff changeset	508 conf.query_routes = g_list_append(conf.query_routes, pair);
08932c629849 reworked the route concept; removed the idea of the localnet markus schnalke <meillo@marmaro.de> parents: 333 diff changeset	509 } else if (strcmp(lval, "permanent_routes") == 0) {
08932c629849 reworked the route concept; removed the idea of the localnet markus schnalke <meillo@marmaro.de> parents: 333 diff changeset	510 conf.perma_routes = parse_list(rval, FALSE);
310 f10a56dc7481 reworked online_detect to the simpler online_query meillo@marmaro.de parents: 307 diff changeset	511 } else if (strcmp(lval, "online_query") == 0)
f10a56dc7481 reworked online_detect to the simpler online_query meillo@marmaro.de parents: 307 diff changeset	512 conf.online_query = g_strdup(rval);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	513 else if (strcmp(lval, "do_queue") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	514 conf.do_queue = parse_boolean(rval);
192 89f951be358f REMOVED POP3 SUPPORT meillo@marmaro.de parents: 190 diff changeset	515 else if (strcmp(lval, "errmsg_file") == 0)
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	516 conf.errmsg_file = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	517 else if (strcmp(lval, "warnmsg_file") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	518 conf.warnmsg_file = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	519 else if (strcmp(lval, "warn_intervals") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	520 conf.warn_intervals = parse_list(rval, FALSE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	521 else if (strcmp(lval, "max_defer_time") == 0) {
254 82d168dd52fd removed the obsolete pos argument from time_interval() markus schnalke <meillo@marmaro.de> parents: 244 diff changeset	522 gint ival = time_interval(rval);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	523 if (ival < 0)
155 b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 153 diff changeset	524 logwrite(LOG_WARNING, "invalid time interval for 'max_defer_time': %s\n", rval);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	525 else
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	526 conf.max_defer_time = ival;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	527 } else if (strcmp(lval, "log_user") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	528 conf.log_user = g_strdup(rval);
117 5ec5e6637049 added server-side SMTP SIZE support (patch by Paolo) meillo@marmaro.de parents: 115 diff changeset	529 else if(strcmp(lval, "max_msg_size") == 0) {
5ec5e6637049 added server-side SMTP SIZE support (patch by Paolo) meillo@marmaro.de parents: 115 diff changeset	530 conf.max_msg_size = atol(rval);
333 0bd27f603910 Added debug level 9 for msgs to stderr during reading config markus schnalke <meillo@marmaro.de> parents: 330 diff changeset	531 DEBUG(9) fprintf(stderr,"rval=%s, conf.max_msg_size=%ld\n",
117 5ec5e6637049 added server-side SMTP SIZE support (patch by Paolo) meillo@marmaro.de parents: 115 diff changeset	532 rval, conf.max_msg_size);
5ec5e6637049 added server-side SMTP SIZE support (patch by Paolo) meillo@marmaro.de parents: 115 diff changeset	533 }
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	534 else
155 b5ab9cb2f18a shut down on errors reading config file meillo@marmaro.de parents: 153 diff changeset	535 logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	536 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	537 fclose(in);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	538
156 ee2afbf92428 require host_name to be set in config file meillo@marmaro.de parents: 155 diff changeset	539 if (!conf.host_name) {
ee2afbf92428 require host_name to be set in config file meillo@marmaro.de parents: 155 diff changeset	540 logwrite(LOG_ALERT, "`host_name' MUST be set in masqmail.conf. See man page\n");
ee2afbf92428 require host_name to be set in config file meillo@marmaro.de parents: 155 diff changeset	541 return FALSE;
ee2afbf92428 require host_name to be set in config file meillo@marmaro.de parents: 155 diff changeset	542 }
ee2afbf92428 require host_name to be set in config file meillo@marmaro.de parents: 155 diff changeset	543
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	544 if (conf.errmsg_file == NULL)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	545 conf.errmsg_file = g_strdup(DATA_DIR "/tpl/failmsg.tpl");
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	546 if (conf.warnmsg_file == NULL)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	547 conf.warnmsg_file = g_strdup(DATA_DIR "/tpl/warnmsg.tpl");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	548
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	549 if (conf.lock_dir == NULL)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	550 conf.lock_dir = g_strdup_printf("%s/lock/", conf.spool_dir);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	551
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	552 if (conf.mbox_default == NULL)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	553 conf.mbox_default = g_strdup("mbox");
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	554
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	555 if (conf.warn_intervals == NULL)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	556 conf.warn_intervals = parse_list("1h;4h;8h;1d;2d;3d", FALSE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	557
157 586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	558 if (!conf.local_hosts) {
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	559 char *shortname = strdup(conf.host_name);
41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	560 char *p = strchr(shortname, '.');
157 586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	561 if (p) {
586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	562 *p = '\0';
586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	563 }
586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	564 /* we don't care if shortname and conf.host_name are the same */
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	565 char *local_hosts_str = g_strdup_printf("localhost;%s;%s", shortname, conf.host_name);
157 586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	566 conf.local_hosts = parse_list(local_hosts_str, FALSE);
586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	567 free(shortname);
586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	568 free(local_hosts_str);
586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	569 }
586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	570
586f001f5bbd local_hosts defaults to localhost;foo;foo.example.org now meillo@marmaro.de parents: 156 diff changeset	571
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	572 return TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	573 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	574
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	575 connect_route*
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	576 read_route(gchar *filename, gboolean is_perma)
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	577 {
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	578 gboolean ok = FALSE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	579 FILE *in;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	580
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	581 connect_route *route = g_malloc(sizeof(connect_route));
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	582 memset(route, 0, sizeof(connect_route));
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	583
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	584 DEBUG(5) debugf("read_route, filename = %s\n", filename);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	585
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	586 route->filename = g_strdup(filename);
357 04744e3e8b18 Closed a memory leak. markus schnalke <meillo@marmaro.de> parents: 354 diff changeset	587 route->name = route->filename; /* quick hack */
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	588
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	589 route->expand_h_sender_address = TRUE;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	590
354 08932c629849 reworked the route concept; removed the idea of the localnet markus schnalke <meillo@marmaro.de> parents: 333 diff changeset	591 route->is_perma = is_perma;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	592
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	593 route->do_pipelining = TRUE;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	594
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	595 if ((in = fopen(route->filename, "r")) == NULL) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	596 logwrite(LOG_ALERT, "could not open route file %s: %s\n", route->filename, strerror(errno));
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	597 g_free(route);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	598 return NULL;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	599 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	600
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	601 gchar lval[256], rval[2048];
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	602 while (read_statement(in, lval, 256, rval, 2048)) {
311 e230bcd0f1c6 removed protocol option from route config meillo@marmaro.de parents: 310 diff changeset	603 if (strcmp(lval, "mail_host") == 0)
178 91f8ee6514f5 removed `remote_port' config option meillo@marmaro.de parents: 164 diff changeset	604 route->mail_host = parse_interface(rval, 25);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	605 else if (strcmp(lval, "helo_name") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	606 route->helo_name = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	607 else if (strcmp(lval, "wrapper") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	608 route->wrapper = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	609 else if (strcmp(lval, "connect_error_fail") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	610 route->connect_error_fail = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	611 else if (strcmp(lval, "do_correct_helo") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	612 route->do_correct_helo = parse_boolean(rval);
222 8cddc65765bd added support for STARTTLS wrappers meillo@marmaro.de parents: 206 diff changeset	613 else if (strcmp(lval, "instant_helo") == 0)
8cddc65765bd added support for STARTTLS wrappers meillo@marmaro.de parents: 206 diff changeset	614 route->instant_helo = parse_boolean(rval);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	615 else if (strcmp(lval, "do_pipelining") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	616 route->do_pipelining = parse_boolean(rval);
317 55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	617
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	618 else if (strcmp(lval, "allowed_senders") == 0)
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	619 route->allowed_senders = parse_address_glob_list(rval, TRUE);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	620 else if (strcmp(lval, "denied_senders") == 0)
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	621 route->denied_senders = parse_address_glob_list(rval, TRUE);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	622 else if (strcmp(lval, "allowed_recipients") == 0)
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	623 route->allowed_recipients = parse_address_glob_list(rval, TRUE);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	624 else if (strcmp(lval, "denied_recipients") == 0)
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	625 route->denied_recipients = parse_address_glob_list(rval, TRUE);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	626
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	627 else if (strcmp(lval, "set_h_from_domain") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	628 route->set_h_from_domain = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	629 else if (strcmp(lval, "set_h_reply_to_domain") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	630 route->set_h_reply_to_domain = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	631 else if (strcmp(lval, "set_return_path_domain") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	632 route->set_return_path_domain = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	633 else if (strcmp(lval, "map_return_path_addresses") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	634 GList node, list;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	635
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	636 list = parse_list(rval, TRUE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	637 foreach(list, node) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	638 gchar item = (gchar ) (node->data);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	639 table_pair *pair = parse_table_pair(item, ':');
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	640 address addr = create_address((gchar ) (pair->value), TRUE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	641 g_free(pair->value);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	642 pair->value = (gpointer *) addr;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	643 route->map_return_path_addresses = g_list_append(route->map_return_path_addresses, pair);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	644 g_free(item);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	645 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	646 g_list_free(list);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	647 } else if (strcmp(lval, "map_h_from_addresses") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	648 GList list, node;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	649
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	650 list = parse_list(rval, TRUE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	651 foreach(list, node) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	652 gchar item = (gchar ) (node->data);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	653 table_pair *pair = parse_table_pair(item, ':');
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	654 route->map_h_from_addresses = g_list_append(route->map_h_from_addresses, pair);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	655 g_free(item);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	656 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	657 g_list_free(list);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	658 } else if (strcmp(lval, "map_h_reply_to_addresses") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	659 GList list, node;
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	660
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	661 list = parse_list(rval, TRUE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	662 foreach(list, node) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	663 gchar item = (gchar ) (node->data);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	664 table_pair *pair = parse_table_pair(item, ':');
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	665 route->map_h_reply_to_addresses = g_list_append(route->map_h_reply_to_addresses, pair);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	666 g_free(item);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	667 }
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	668 g_list_free(list);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	669 } else if (strcmp(lval, "map_h_mail_followup_to_addresses") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	670 GList list, node;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	671
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	672 list = parse_list(rval, TRUE);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	673 foreach(list, node) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	674 gchar item = (gchar ) (node->data);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	675 table_pair *pair = parse_table_pair(item, ':');
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	676 route->map_h_mail_followup_to_addresses = g_list_append(route->map_h_mail_followup_to_addresses, pair);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	677 g_free(item);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	678 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	679 g_list_free(list);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	680 } else if (strcmp(lval, "expand_h_sender_domain") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	681 route->expand_h_sender_domain = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	682 } else if (strcmp(lval, "expand_h_sender_address") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	683 route->expand_h_sender_address = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	684 } else if (strcmp(lval, "resolve_list") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	685 route->resolve_list = parse_resolve_list(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	686 else if (strcmp(lval, "do_ssl") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	687 /* we ignore this. This option is used by sqilconf */
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	688 ;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	689 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	690 #ifdef ENABLE_AUTH
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	691 else if (strcmp(lval, "auth_name") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	692 route->auth_name = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	693 } else if (strcmp(lval, "auth_login") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	694 route->auth_login = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	695 } else if (strcmp(lval, "auth_secret") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	696 route->auth_secret = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	697 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	698 #else
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	699 else if ((strcmp(lval, "auth_name") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	700 \|\| (strcmp(lval, "auth_login") == 0)
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	701 \|\| (strcmp(lval, "auth_secret") == 0)) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	702 logwrite(LOG_WARNING, "%s ignored: not compiled with auth support.\n", lval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	703 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	704 #endif
190 6b4a101a2455 forgot to remove the pop3_login option in conf.c in the last commit meillo@marmaro.de parents: 178 diff changeset	705 else if (strcmp(lval, "pipe") == 0) {
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	706 route->pipe = g_strdup(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	707 } else if (strcmp(lval, "pipe_fromline") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	708 route->pipe_fromline = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	709 } else if (strcmp(lval, "pipe_fromhack") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	710 route->pipe_fromhack = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	711 } else if (strcmp(lval, "last_route") == 0) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	712 route->last_route = parse_boolean(rval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	713 } else
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	714 logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	715 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	716
319 d41fb3b9ed3e refactoring in the small meillo@marmaro.de parents: 317 diff changeset	717 if (!route->resolve_list) {
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	718 #ifdef ENABLE_RESOLVER
354 08932c629849 reworked the route concept; removed the idea of the localnet markus schnalke <meillo@marmaro.de> parents: 333 diff changeset	719 route->resolve_list = g_list_append(route->resolve_list, resolve_dns_mx);
08932c629849 reworked the route concept; removed the idea of the localnet markus schnalke <meillo@marmaro.de> parents: 333 diff changeset	720 route->resolve_list = g_list_append(route->resolve_list, resolve_dns_a);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	721 #endif
319 d41fb3b9ed3e refactoring in the small meillo@marmaro.de parents: 317 diff changeset	722 route->resolve_list = g_list_append(route->resolve_list, resolve_byname);
28 71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	723 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	724 fclose(in);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	725 ok = TRUE;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	726
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	727 /* warn user about misconfigurations: */
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	728 if ((route->map_h_from_addresses != NULL) && (route->set_h_from_domain != NULL)) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	729 logwrite(LOG_WARNING, "'map_h_from_addresses' overrides 'set_h_from_domain'\n");
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	730 g_free(route->set_h_from_domain);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	731 route->set_h_from_domain = NULL;
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	732 }
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	733 if ((route->map_h_reply_to_addresses != NULL) && (route->set_h_reply_to_domain != NULL)) {
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	734 logwrite(LOG_WARNING, "'map_h_reply_to_addresses' overrides 'set_h_reply_to_domain'\n");
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	735 g_free(route->set_h_reply_to_domain);
71605f542ecc flattened conditional nesting meillo@marmaro.de parents: 14 diff changeset	736 route->set_h_reply_to_domain = NULL;
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	737 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	738
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	739 if (!ok) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	740 g_free(route);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	741 route = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	742 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	743
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	744 return route;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	745 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	746
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	747 static void
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	748 _g_list_free_all(GList *list)
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	749 {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	750 GList *node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	751 if (list) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	752 foreach(list, node)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	753 g_free(node->data);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	754 g_list_free(list);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	755 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	756 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	757
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	758 void
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	759 destroy_route(connect_route *r)
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	760 {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	761 if (r->filename)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	762 g_free(r->filename);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	763 if (r->mail_host) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	764 g_free(r->mail_host->address);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	765 g_free(r->mail_host);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	766 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	767 if (r->wrapper)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	768 g_free(r->wrapper);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	769 if (r->helo_name)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	770 g_free(r->helo_name);
317 55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	771 _g_list_free_all(r->allowed_senders);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	772 _g_list_free_all(r->denied_senders);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	773 _g_list_free_all(r->allowed_recipients);
55b7bde95d37 reworked allowed and denied addrs for routes meillo@marmaro.de parents: 311 diff changeset	774 _g_list_free_all(r->denied_recipients);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	775 if (r->set_h_from_domain)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	776 g_free(r->set_h_from_domain);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	777 if (r->set_h_reply_to_domain)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	778 g_free(r->set_h_reply_to_domain);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	779 if (r->set_return_path_domain)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	780 g_free(r->set_return_path_domain);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	781 if (r->map_h_reply_to_addresses)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	782 destroy_table(r->map_h_reply_to_addresses);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	783 if (r->resolve_list)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	784 g_list_free(r->resolve_list);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	785 #ifdef ENABLE_AUTH
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	786 if (r->auth_name)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	787 g_free(r->auth_name);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	788 if (r->auth_login)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	789 g_free(r->auth_login);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	790 if (r->auth_secret)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	791 g_free(r->auth_secret);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	792 #endif
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	793 if (r->pipe)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	794 g_free(r->pipe);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	795 g_free(r);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	796 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	797
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	798 GList*
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	799 read_route_list(GList *rf_list, gboolean is_perma)
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	800 {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	801 GList *list = NULL;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	802 GList *node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	803 uid_t saved_uid, saved_gid;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	804
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	805 if (!conf.run_as_user) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	806 set_euidgid(0, 0, &saved_uid, &saved_gid);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	807 }
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	808
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	809 foreach(rf_list, node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	810 gchar fname = (gchar ) (node->data);
354 08932c629849 reworked the route concept; removed the idea of the localnet markus schnalke <meillo@marmaro.de> parents: 333 diff changeset	811 connect_route *route = read_route(fname, is_perma);
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	812 if (route)
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	813 list = g_list_append(list, route);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	814 else
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	815 logwrite(LOG_ALERT, "could not read route configuration %s\n", fname);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	816 }
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	817
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	818 /* set uid and gid back */
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	819 if (!conf.run_as_user) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	820 set_euidgid(saved_uid, saved_gid, NULL, NULL);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	821 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	822
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	823 return list;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	824 }
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	825
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	826 void
366 41958685480d Switched to `type name' style markus schnalke <meillo@marmaro.de>* parents: 359 diff changeset	827 destroy_route_list(GList *list)
10 26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	828 {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	829 GList *node;
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	830
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	831 foreach(list, node) {
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	832 connect_route route = (connect_route ) (node->data);
26e34ae9a3e3 changed indention and line wrapping to a more consistent style meillo@marmaro.de parents: 0 diff changeset	833 destroy_route(route);
0 08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	834 }
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	835 g_list_free(list);
08114f7dcc23 this is masqmail-0.2.21 from oliver kurth meillo@marmaro.de parents: diff changeset	836 }

Mercurial > masqmail

annotate src/conf.c @ 391:0ca270ca11fa