Mercurial > masqmail
annotate src/conf.c @ 367:b27f66555ba8
Reformated multiline comments to have leading asterisks on each line
Now we use:
/*
** comment
*/
This makes the indent style simpler, too.
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Thu, 20 Oct 2011 10:20:59 +0200 |
| parents | 41958685480d |
| children | 5781ba87df95 |
| 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 | 19 */ |
| 20 | |
| 13 | 21 #include <pwd.h> |
| 22 #include <grp.h> | |
| 0 | 23 |
| 13 | 24 #include "masqmail.h" |
| 0 | 25 |
| 26 masqmail_conf conf; | |
| 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 | 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 | 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 | 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 | 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 | 51 } |
| 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 | 55 }; |
| 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 | 59 }; |
| 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 | 63 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
64 gchar **str; |
| 0 | 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 | 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 | 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 | 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 | 84 } |
| 85 | |
| 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 | 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 | 92 |
| 28 | 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 | 97 |
| 28 | 98 gchar buf[256]; |
| 99 | |
| 100 while (!feof(fptr)) { | |
| 101 fgets(buf, 255, fptr); | |
| 102 if (buf[0] && (buf[0] != '#') && (buf[0] != '\n')) { | |
| 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 | 105 list = g_list_append(list, g_strdup(buf)); |
| 106 } | |
| 107 } | |
| 108 fclose(fptr); | |
| 109 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
110 return list; |
| 0 | 111 } |
| 112 | |
| 13 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 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 | 144 } |
| 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 | 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 | 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 | 190 } |
| 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 | 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 | 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 | 200 if (!list) { |
| 201 return NULL; | |
| 202 } | |
| 203 | |
| 204 foreach(list, list_node) { | |
| 205 gchar *item = (gchar *) (list_node->data); | |
| 206 if (strcmp(item, "byname") == 0) { | |
| 207 res_list = g_list_append(res_list, resolve_byname); | |
| 0 | 208 #ifdef ENABLE_RESOLVER |
| 28 | 209 } else if (strcmp(item, "dns_a") == 0) { |
| 210 res_list = g_list_append(res_list, resolve_dns_a); | |
| 211 } else if (strcmp(item, "dns_mx") == 0) { | |
| 212 res_list = g_list_append(res_list, resolve_dns_mx); | |
| 0 | 213 #endif |
| 28 | 214 } else { |
| 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 | 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 | 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 | 222 } |
| 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 | 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 | 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 | 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 | 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 | 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 | 248 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
249 return iface; |
| 0 | 250 } |
| 251 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
252 #ifdef ENABLE_IDENT /* so far used for that only */ |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
253 static struct in_addr* |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
254 parse_network(gchar *line, gint def_port) |
| 0 | 255 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
256 gchar buf[256]; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
257 gchar *p, *q; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
258 struct in_addr addr, mask_addr, net_addr, *p_net_addr; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
259 guint n; |
| 0 | 260 |
|
333
0bd27f603910
Added debug level 9 for msgs to stderr during reading config
markus schnalke <meillo@marmaro.de>
parents:
330
diff
changeset
|
261 DEBUG(9) fprintf(stderr, "parse_network: %s\n", line); |
| 0 | 262 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
263 p = line; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
264 q = buf; |
| 359 | 265 while (*p && (*p != '/') && (q < buf + 255)) |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
266 *(q++) = *(p++); |
|
14
a8f3424347dc
replaced number 0 with character \0 where appropriate
meillo@marmaro.de
parents:
13
diff
changeset
|
267 *q = '\0'; |
| 0 | 268 |
| 28 | 269 if ((addr.s_addr = inet_addr(buf)) == INADDR_NONE) { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
270 fprintf(stderr, "'%s' is not a valid address (must be ip)\n", buf); |
|
262
fc1c6425c024
s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/
markus schnalke <meillo@marmaro.de>
parents:
254
diff
changeset
|
271 exit(1); |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
272 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
273 |
| 28 | 274 if (*p) { |
| 275 guint i; | |
| 276 p++; | |
| 277 i = atoi(p); | |
| 278 if ((i >= 0) && (i <= 32)) | |
| 279 n = i ? ~((1 << (32 - i)) - 1) : 0; | |
| 280 else { | |
| 281 fprintf(stderr, "'%d' is not a valid net mask (must be >= 0 and <= 32)\n", i); | |
|
262
fc1c6425c024
s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/
markus schnalke <meillo@marmaro.de>
parents:
254
diff
changeset
|
282 exit(1); |
| 28 | 283 } |
| 284 } else | |
| 285 n = 0; | |
| 286 | |
| 287 mask_addr.s_addr = htonl(n); | |
| 288 net_addr.s_addr = mask_addr.s_addr & addr.s_addr; | |
| 289 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
290 p_net_addr = g_malloc(sizeof(struct in_addr)); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
291 p_net_addr->s_addr = net_addr.s_addr; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
292 return p_net_addr; |
| 0 | 293 } |
| 294 #endif | |
| 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 eat_comments(FILE *in) |
| 0 | 298 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
299 gint c; |
| 0 | 300 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
301 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
|
302 c = fgetc(in)) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
303 if (c == '#') { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
304 gint c; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
305 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
|
306 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
307 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
308 if (c == EOF) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
309 return FALSE; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
310 ungetc(c, in); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
311 return TRUE; |
| 0 | 312 } |
| 313 | |
| 314 /* 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
|
315 static gboolean |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
316 eat_line_trailing(FILE *in) |
| 0 | 317 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
318 gint c; |
| 0 | 319 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
320 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
|
321 if (c == EOF) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
322 return FALSE; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
323 return TRUE; |
| 0 | 324 } |
| 325 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
326 static gboolean |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
327 eat_spaces(FILE *in) |
| 0 | 328 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
329 gint c; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
330 |
| 28 | 331 for (c = fgetc(in); c != EOF && isspace(c); c = fgetc(in)) { |
| 332 /* empty */ | |
| 333 } | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
334 if (c == EOF) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
335 return FALSE; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
336 ungetc(c, in); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
337 return TRUE; |
| 0 | 338 } |
| 339 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
340 static gboolean |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
341 read_lval(FILE *in, gchar *buf, gint size) |
| 0 | 342 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
343 gint c; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
344 gchar *ptr = buf; |
| 0 | 345 |
|
333
0bd27f603910
Added debug level 9 for msgs to stderr during reading config
markus schnalke <meillo@marmaro.de>
parents:
330
diff
changeset
|
346 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
|
347 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
348 if (!eat_spaces(in)) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
349 return FALSE; |
| 0 | 350 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
351 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
|
352 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
|
353 while ((isalnum(c) || c == '_' || c == '-' || c == '.') |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
354 && (ptr < buf + size - 1) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
355 && (c != EOF)) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
356 *ptr = c; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
357 ptr++; |
|
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 } |
|
14
a8f3424347dc
replaced number 0 with character \0 where appropriate
meillo@marmaro.de
parents:
13
diff
changeset
|
360 *ptr = '\0'; |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
361 ungetc(c, in); |
| 0 | 362 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
363 if (c == EOF) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
364 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
|
365 return FALSE; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
366 } else if (ptr >= buf + size - 1) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
367 fprintf(stderr, "lval too long\n"); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
368 } |
| 0 | 369 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
370 eat_spaces(in); |
| 0 | 371 |
|
333
0bd27f603910
Added debug level 9 for msgs to stderr during reading config
markus schnalke <meillo@marmaro.de>
parents:
330
diff
changeset
|
372 DEBUG(9) fprintf(stderr, "lval = %s\n", buf); |
| 0 | 373 |
|
14
a8f3424347dc
replaced number 0 with character \0 where appropriate
meillo@marmaro.de
parents:
13
diff
changeset
|
374 return buf[0] != '\0'; |
| 0 | 375 } |
| 376 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
377 static gboolean |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
378 read_rval(FILE *in, gchar *buf, gint size) |
| 0 | 379 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
380 gint c; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
381 gchar *ptr = buf; |
| 0 | 382 |
|
333
0bd27f603910
Added debug level 9 for msgs to stderr during reading config
markus schnalke <meillo@marmaro.de>
parents:
330
diff
changeset
|
383 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
|
384 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
385 if (!eat_spaces(in)) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
386 return FALSE; |
| 0 | 387 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
388 c = fgetc(in); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
389 if (c != '\"') { |
|
115
315773f814f7
allow `:' unquoted too; updated masqmail.conf.5 (Thanks to Paolo)
meillo@marmaro.de
parents:
114
diff
changeset
|
390 while ((isalnum(c) || c == '_' || c == '-' || c == '.' |
|
315773f814f7
allow `:' unquoted too; updated masqmail.conf.5 (Thanks to Paolo)
meillo@marmaro.de
parents:
114
diff
changeset
|
391 || c == '/' || c == '@' || c == ';' || c == ':') |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
392 && (ptr < buf + size - 1) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
393 && (c != EOF)) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
394 *ptr = c; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
395 ptr++; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
396 c = fgetc(in); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
397 } |
|
14
a8f3424347dc
replaced number 0 with character \0 where appropriate
meillo@marmaro.de
parents:
13
diff
changeset
|
398 *ptr = '\0'; |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
399 ungetc(c, in); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
400 } else { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
401 gboolean escape = FALSE; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
402 c = fgetc(in); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
403 while (((c != '\"') || escape) && (ptr < buf + size - 1)) { |
| 13 | 404 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
|
405 if ((c == '\\') && (!escape)) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
406 escape = TRUE; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
407 } else { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
408 *ptr = c; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
409 ptr++; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
410 escape = FALSE; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
411 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
412 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
413 c = fgetc(in); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
414 } |
|
14
a8f3424347dc
replaced number 0 with character \0 where appropriate
meillo@marmaro.de
parents:
13
diff
changeset
|
415 *ptr = '\0'; |
| 0 | 416 } |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
417 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
418 eat_line_trailing(in); |
| 0 | 419 |
|
333
0bd27f603910
Added debug level 9 for msgs to stderr during reading config
markus schnalke <meillo@marmaro.de>
parents:
330
diff
changeset
|
420 DEBUG(9) fprintf(stderr, "rval = %s\n", buf); |
| 0 | 421 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
422 return TRUE; |
| 0 | 423 } |
| 424 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
425 static gboolean |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
426 read_statement(FILE *in, gchar *lval, gint lsize, gchar *rval, gint rsize) |
| 0 | 427 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
428 gint c; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
429 |
|
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_statement()\n"); |
| 0 | 431 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
432 /* eat comments and empty lines: */ |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
433 if (!eat_comments(in)) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
434 return FALSE; |
| 0 | 435 |
| 28 | 436 if (!read_lval(in, lval, lsize)) { |
| 437 return FALSE; | |
| 438 } | |
| 439 | |
|
333
0bd27f603910
Added debug level 9 for msgs to stderr during reading config
markus schnalke <meillo@marmaro.de>
parents:
330
diff
changeset
|
440 DEBUG(9) fprintf(stderr, " lval = %s\n", lval); |
| 28 | 441 if ((c = fgetc(in) == '=')) { |
| 442 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
|
443 DEBUG(9) fprintf(stderr, " rval = %s\n", rval); |
| 28 | 444 return TRUE; |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
445 } |
| 28 | 446 } else { |
|
333
0bd27f603910
Added debug level 9 for msgs to stderr during reading config
markus schnalke <meillo@marmaro.de>
parents:
330
diff
changeset
|
447 DEBUG(9) fprintf(stderr," '=' expected after %s, char was '%c'\n", lval, c); |
| 28 | 448 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
|
449 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
450 return FALSE; |
| 0 | 451 } |
| 452 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
453 gboolean |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
454 read_conf(gchar *filename) |
| 0 | 455 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
456 FILE *in; |
| 0 | 457 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
458 conf.log_max_pri = 7; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
459 conf.do_relay = TRUE; |
|
244
7082044c05c6
renamed `alias_local_cmp' to `localpartcmp'
markus schnalke <meillo@marmaro.de>
parents:
243
diff
changeset
|
460 conf.localpartcmp = strcmp; |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
461 conf.max_defer_time = 86400 * 4; /* 4 days */ |
|
120
cd59a5b4d3dd
added support for SMTP SIZE 0 (unlimited)
meillo@marmaro.de
parents:
117
diff
changeset
|
462 conf.max_msg_size = 0; /* no limit on msg size */ |
| 151 | 463 conf.spool_dir = SPOOL_DIR; |
| 152 | 464 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
|
465 conf.listen_addresses = g_list_append(NULL, parse_interface("localhost", 25)); |
| 0 | 466 |
| 28 | 467 if ((in = fopen(filename, "r")) == NULL) { |
| 155 | 468 logwrite(LOG_ALERT, "could not open config file %s: %s\n", filename, strerror(errno)); |
| 28 | 469 return FALSE; |
| 470 } | |
| 0 | 471 |
| 28 | 472 gchar lval[256], rval[2048]; |
| 473 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
|
474 DEBUG(9) fprintf(stderr,"read_conf(): lval=%s\n", lval); |
| 28 | 475 if (strcmp(lval, "debug_level") == 0) |
| 476 conf.debug_level = atoi(rval); | |
| 477 else if (strcmp(lval, "run_as_user") == 0) { | |
| 478 if (!conf.run_as_user) /* you should not be able to reset that flag */ | |
| 479 conf.run_as_user = parse_boolean(rval); | |
| 480 } else if (strcmp(lval, "use_syslog") == 0) | |
| 481 conf.use_syslog = parse_boolean(rval); | |
| 482 else if (strcmp(lval, "mail_dir") == 0) | |
| 483 conf.mail_dir = g_strdup(rval); | |
| 484 else if (strcmp(lval, "lock_dir") == 0) | |
| 485 conf.lock_dir = g_strdup(rval); | |
| 486 else if (strcmp(lval, "spool_dir") == 0) | |
| 487 conf.spool_dir = g_strdup(rval); | |
| 488 else if (strcmp(lval, "log_dir") == 0) | |
| 489 conf.log_dir = g_strdup(rval); | |
| 490 else if (strcmp(lval, "host_name") == 0) { | |
| 491 if (rval[0] != '/') | |
| 492 conf.host_name = g_strdup(rval); | |
| 493 else { | |
| 494 char buf[256]; | |
| 495 FILE *fptr = fopen(rval, "rt"); | |
| 307 | 496 if (!fptr) { |
| 155 | 497 logwrite(LOG_ALERT, "could not open %s: %s\n", rval, strerror(errno)); |
| 28 | 498 return FALSE; |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
499 } |
| 28 | 500 fgets(buf, 255, fptr); |
| 501 g_strchomp(buf); | |
| 502 conf.host_name = g_strdup(buf); | |
| 503 fclose(fptr); | |
| 504 } | |
| 505 } else if (strcmp(lval, "local_hosts") == 0) | |
| 506 conf.local_hosts = parse_list(rval, FALSE); | |
| 507 else if (strcmp(lval, "local_addresses") == 0) | |
| 508 conf.local_addresses = parse_list(rval, TRUE); | |
| 509 else if (strcmp(lval, "not_local_addresses") == 0) | |
| 510 conf.not_local_addresses = parse_list(rval, TRUE); | |
| 511 else if (strcmp(lval, "do_save_envelope_to") == 0) | |
| 512 conf.do_save_envelope_to = parse_boolean(rval); | |
| 513 else if (strcmp(lval, "defer_all") == 0) | |
| 514 conf.defer_all = parse_boolean(rval); | |
| 515 else if (strcmp(lval, "do_relay") == 0) | |
| 516 conf.do_relay = parse_boolean(rval); | |
| 517 else if (strcmp(lval, "alias_file") == 0) { | |
| 518 conf.alias_file = g_strdup(rval); | |
|
243
e758296de02d
renamed `alias_local_caseless' to `caseless_matching'
markus schnalke <meillo@marmaro.de>
parents:
234
diff
changeset
|
519 } else if (strcmp(lval, "caseless_matching") == 0) { |
|
244
7082044c05c6
renamed `alias_local_cmp' to `localpartcmp'
markus schnalke <meillo@marmaro.de>
parents:
243
diff
changeset
|
520 conf.localpartcmp = parse_boolean(rval) ? strcasecmp : strcmp; |
| 28 | 521 } else if (strcmp(lval, "mbox_default") == 0) { |
| 522 conf.mbox_default = g_strdup(rval); | |
| 523 } else if (strcmp(lval, "mbox_users") == 0) { | |
| 524 conf.mbox_users = parse_list(rval, TRUE); | |
| 525 } else if (strcmp(lval, "mda_users") == 0) { | |
| 526 conf.mda_users = parse_list(rval, TRUE); | |
| 527 } else if (strcmp(lval, "mda") == 0) { | |
| 528 conf.mda = g_strdup(rval); | |
| 529 } else if (strcmp(lval, "mda_fromline") == 0) { | |
| 530 conf.mda_fromline = parse_boolean(rval); | |
| 531 } else if (strcmp(lval, "mda_fromhack") == 0) { | |
| 532 conf.mda_fromhack = parse_boolean(rval); | |
| 533 } else if (strcmp(lval, "pipe_fromline") == 0) { | |
| 534 conf.pipe_fromline = parse_boolean(rval); | |
| 535 } else if (strcmp(lval, "pipe_fromhack") == 0) { | |
| 536 conf.pipe_fromhack = parse_boolean(rval); | |
| 537 } else if (strcmp(lval, "listen_addresses") == 0) { | |
| 538 GList *node; | |
| 539 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
|
540 |
| 28 | 541 conf.listen_addresses = NULL; |
| 542 foreach(tmp_list, node) { | |
| 543 conf.listen_addresses = g_list_append(conf.listen_addresses, parse_interface((gchar *) (node-> data), 25)); | |
| 544 g_free(node->data); | |
| 545 } | |
| 546 g_list_free(tmp_list); | |
| 547 } else if (strcmp(lval, "ident_trusted_nets") == 0) { | |
| 548 #ifdef ENABLE_IDENT | |
| 549 GList *node; | |
| 550 GList *tmp_list = parse_list(rval, FALSE); | |
| 551 | |
| 552 conf.ident_trusted_nets = NULL; | |
| 553 foreach(tmp_list, node) { | |
| 554 conf.ident_trusted_nets = g_list_append(conf.ident_trusted_nets, parse_network((gchar *) (node->data), 25)); | |
| 555 g_free(node->data); | |
| 556 } | |
| 557 g_list_free(tmp_list); | |
| 0 | 558 #else |
| 155 | 559 logwrite(LOG_WARNING, "%s ignored: not compiled with ident support\n", lval); |
| 0 | 560 #endif |
|
354
08932c629849
reworked the route concept; removed the idea of the localnet
markus schnalke <meillo@marmaro.de>
parents:
333
diff
changeset
|
561 } else if (strncmp(lval, "query_routes.", 13) == 0) { |
| 28 | 562 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
|
563 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
|
564 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
|
565 } 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
|
566 conf.perma_routes = parse_list(rval, FALSE); |
|
310
f10a56dc7481
reworked online_detect to the simpler online_query
meillo@marmaro.de
parents:
307
diff
changeset
|
567 } else if (strcmp(lval, "online_query") == 0) |
|
f10a56dc7481
reworked online_detect to the simpler online_query
meillo@marmaro.de
parents:
307
diff
changeset
|
568 conf.online_query = g_strdup(rval); |
| 28 | 569 else if (strcmp(lval, "do_queue") == 0) |
| 570 conf.do_queue = parse_boolean(rval); | |
| 192 | 571 else if (strcmp(lval, "errmsg_file") == 0) |
| 28 | 572 conf.errmsg_file = g_strdup(rval); |
| 573 else if (strcmp(lval, "warnmsg_file") == 0) | |
| 574 conf.warnmsg_file = g_strdup(rval); | |
| 575 else if (strcmp(lval, "warn_intervals") == 0) | |
| 576 conf.warn_intervals = parse_list(rval, FALSE); | |
| 577 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
|
578 gint ival = time_interval(rval); |
| 28 | 579 if (ival < 0) |
| 155 | 580 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
|
581 else |
| 28 | 582 conf.max_defer_time = ival; |
| 583 } else if (strcmp(lval, "log_user") == 0) | |
| 584 conf.log_user = g_strdup(rval); | |
|
117
5ec5e6637049
added server-side SMTP SIZE support (patch by Paolo)
meillo@marmaro.de
parents:
115
diff
changeset
|
585 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
|
586 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
|
587 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
|
588 rval, conf.max_msg_size); |
|
5ec5e6637049
added server-side SMTP SIZE support (patch by Paolo)
meillo@marmaro.de
parents:
115
diff
changeset
|
589 } |
| 28 | 590 else |
| 155 | 591 logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval); |
| 28 | 592 } |
| 593 fclose(in); | |
| 0 | 594 |
|
156
ee2afbf92428
require host_name to be set in config file
meillo@marmaro.de
parents:
155
diff
changeset
|
595 if (!conf.host_name) { |
|
ee2afbf92428
require host_name to be set in config file
meillo@marmaro.de
parents:
155
diff
changeset
|
596 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
|
597 return FALSE; |
|
ee2afbf92428
require host_name to be set in config file
meillo@marmaro.de
parents:
155
diff
changeset
|
598 } |
|
ee2afbf92428
require host_name to be set in config file
meillo@marmaro.de
parents:
155
diff
changeset
|
599 |
| 28 | 600 if (conf.errmsg_file == NULL) |
| 601 conf.errmsg_file = g_strdup(DATA_DIR "/tpl/failmsg.tpl"); | |
| 602 if (conf.warnmsg_file == NULL) | |
| 603 conf.warnmsg_file = g_strdup(DATA_DIR "/tpl/warnmsg.tpl"); | |
| 0 | 604 |
| 28 | 605 if (conf.lock_dir == NULL) |
| 606 conf.lock_dir = g_strdup_printf("%s/lock/", conf.spool_dir); | |
| 0 | 607 |
| 28 | 608 if (conf.mbox_default == NULL) |
| 609 conf.mbox_default = g_strdup("mbox"); | |
| 0 | 610 |
| 28 | 611 if (conf.warn_intervals == NULL) |
| 612 conf.warn_intervals = parse_list("1h;4h;8h;1d;2d;3d", FALSE); | |
| 613 | |
|
157
586f001f5bbd
local_hosts defaults to localhost;foo;foo.example.org now
meillo@marmaro.de
parents:
156
diff
changeset
|
614 if (!conf.local_hosts) { |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
615 char *shortname = strdup(conf.host_name); |
|
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
616 char *p = strchr(shortname, '.'); |
|
157
586f001f5bbd
local_hosts defaults to localhost;foo;foo.example.org now
meillo@marmaro.de
parents:
156
diff
changeset
|
617 if (p) { |
|
586f001f5bbd
local_hosts defaults to localhost;foo;foo.example.org now
meillo@marmaro.de
parents:
156
diff
changeset
|
618 *p = '\0'; |
|
586f001f5bbd
local_hosts defaults to localhost;foo;foo.example.org now
meillo@marmaro.de
parents:
156
diff
changeset
|
619 } |
|
586f001f5bbd
local_hosts defaults to localhost;foo;foo.example.org now
meillo@marmaro.de
parents:
156
diff
changeset
|
620 /* 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
|
621 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
|
622 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
|
623 free(shortname); |
|
586f001f5bbd
local_hosts defaults to localhost;foo;foo.example.org now
meillo@marmaro.de
parents:
156
diff
changeset
|
624 free(local_hosts_str); |
|
586f001f5bbd
local_hosts defaults to localhost;foo;foo.example.org now
meillo@marmaro.de
parents:
156
diff
changeset
|
625 } |
|
586f001f5bbd
local_hosts defaults to localhost;foo;foo.example.org now
meillo@marmaro.de
parents:
156
diff
changeset
|
626 |
|
586f001f5bbd
local_hosts defaults to localhost;foo;foo.example.org now
meillo@marmaro.de
parents:
156
diff
changeset
|
627 |
| 28 | 628 return TRUE; |
| 0 | 629 } |
| 630 | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
631 connect_route* |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
632 read_route(gchar *filename, gboolean is_perma) |
| 0 | 633 { |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
634 gboolean ok = FALSE; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
635 FILE *in; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
636 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
637 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
|
638 memset(route, 0, sizeof(connect_route)); |
| 0 | 639 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
640 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
|
641 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
642 route->filename = g_strdup(filename); |
| 357 | 643 route->name = route->filename; /* quick hack */ |
| 0 | 644 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
645 route->expand_h_sender_address = TRUE; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
646 |
|
354
08932c629849
reworked the route concept; removed the idea of the localnet
markus schnalke <meillo@marmaro.de>
parents:
333
diff
changeset
|
647 route->is_perma = is_perma; |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
648 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
649 route->do_pipelining = TRUE; |
| 0 | 650 |
| 28 | 651 if ((in = fopen(route->filename, "r")) == NULL) { |
| 652 logwrite(LOG_ALERT, "could not open route file %s: %s\n", route->filename, strerror(errno)); | |
| 653 g_free(route); | |
| 654 return NULL; | |
| 655 } | |
| 0 | 656 |
| 28 | 657 gchar lval[256], rval[2048]; |
| 658 while (read_statement(in, lval, 256, rval, 2048)) { | |
|
311
e230bcd0f1c6
removed protocol option from route config
meillo@marmaro.de
parents:
310
diff
changeset
|
659 if (strcmp(lval, "mail_host") == 0) |
| 178 | 660 route->mail_host = parse_interface(rval, 25); |
| 28 | 661 else if (strcmp(lval, "helo_name") == 0) |
| 662 route->helo_name = g_strdup(rval); | |
| 663 else if (strcmp(lval, "wrapper") == 0) | |
| 664 route->wrapper = g_strdup(rval); | |
| 665 else if (strcmp(lval, "connect_error_fail") == 0) | |
| 666 route->connect_error_fail = parse_boolean(rval); | |
| 667 else if (strcmp(lval, "do_correct_helo") == 0) | |
| 668 route->do_correct_helo = parse_boolean(rval); | |
| 222 | 669 else if (strcmp(lval, "instant_helo") == 0) |
| 670 route->instant_helo = parse_boolean(rval); | |
| 28 | 671 else if (strcmp(lval, "do_pipelining") == 0) |
| 672 route->do_pipelining = parse_boolean(rval); | |
|
317
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
673 |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
674 else if (strcmp(lval, "allowed_senders") == 0) |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
675 route->allowed_senders = parse_address_glob_list(rval, TRUE); |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
676 else if (strcmp(lval, "denied_senders") == 0) |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
677 route->denied_senders = parse_address_glob_list(rval, TRUE); |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
678 else if (strcmp(lval, "allowed_recipients") == 0) |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
679 route->allowed_recipients = parse_address_glob_list(rval, TRUE); |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
680 else if (strcmp(lval, "denied_recipients") == 0) |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
681 route->denied_recipients = parse_address_glob_list(rval, TRUE); |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
682 |
| 28 | 683 else if (strcmp(lval, "set_h_from_domain") == 0) |
| 684 route->set_h_from_domain = g_strdup(rval); | |
| 685 else if (strcmp(lval, "set_h_reply_to_domain") == 0) | |
| 686 route->set_h_reply_to_domain = g_strdup(rval); | |
| 687 else if (strcmp(lval, "set_return_path_domain") == 0) | |
| 688 route->set_return_path_domain = g_strdup(rval); | |
| 689 else if (strcmp(lval, "map_return_path_addresses") == 0) { | |
| 690 GList *node, *list; | |
| 0 | 691 |
| 28 | 692 list = parse_list(rval, TRUE); |
| 693 foreach(list, node) { | |
| 694 gchar *item = (gchar *) (node->data); | |
| 695 table_pair *pair = parse_table_pair(item, ':'); | |
| 696 address *addr = create_address((gchar *) (pair->value), TRUE); | |
| 697 g_free(pair->value); | |
| 698 pair->value = (gpointer *) addr; | |
| 699 route->map_return_path_addresses = g_list_append(route->map_return_path_addresses, pair); | |
| 700 g_free(item); | |
| 701 } | |
| 702 g_list_free(list); | |
| 703 } else if (strcmp(lval, "map_h_from_addresses") == 0) { | |
| 704 GList *list, *node; | |
| 0 | 705 |
| 28 | 706 list = parse_list(rval, TRUE); |
| 707 foreach(list, node) { | |
| 708 gchar *item = (gchar *) (node->data); | |
| 709 table_pair *pair = parse_table_pair(item, ':'); | |
| 710 route->map_h_from_addresses = g_list_append(route->map_h_from_addresses, pair); | |
| 711 g_free(item); | |
| 712 } | |
| 713 g_list_free(list); | |
| 714 } else if (strcmp(lval, "map_h_reply_to_addresses") == 0) { | |
| 715 GList *list, *node; | |
| 0 | 716 |
| 28 | 717 list = parse_list(rval, TRUE); |
| 718 foreach(list, node) { | |
| 719 gchar *item = (gchar *) (node->data); | |
| 720 table_pair *pair = parse_table_pair(item, ':'); | |
| 721 route->map_h_reply_to_addresses = g_list_append(route->map_h_reply_to_addresses, pair); | |
| 722 g_free(item); | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
723 } |
| 28 | 724 g_list_free(list); |
| 725 } else if (strcmp(lval, "map_h_mail_followup_to_addresses") == 0) { | |
| 726 GList *list, *node; | |
| 727 | |
| 728 list = parse_list(rval, TRUE); | |
| 729 foreach(list, node) { | |
| 730 gchar *item = (gchar *) (node->data); | |
| 731 table_pair *pair = parse_table_pair(item, ':'); | |
| 732 route->map_h_mail_followup_to_addresses = g_list_append(route->map_h_mail_followup_to_addresses, pair); | |
| 733 g_free(item); | |
| 734 } | |
| 735 g_list_free(list); | |
| 736 } else if (strcmp(lval, "expand_h_sender_domain") == 0) { | |
| 737 route->expand_h_sender_domain = parse_boolean(rval); | |
| 738 } else if (strcmp(lval, "expand_h_sender_address") == 0) { | |
| 739 route->expand_h_sender_address = parse_boolean(rval); | |
| 740 } else if (strcmp(lval, "resolve_list") == 0) | |
| 741 route->resolve_list = parse_resolve_list(rval); | |
| 742 else if (strcmp(lval, "do_ssl") == 0) { | |
| 743 /* we ignore this. This option is used by sqilconf */ | |
| 744 ; | |
| 745 } | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
746 #ifdef ENABLE_AUTH |
| 28 | 747 else if (strcmp(lval, "auth_name") == 0) { |
| 748 route->auth_name = g_strdup(rval); | |
| 749 } else if (strcmp(lval, "auth_login") == 0) { | |
| 750 route->auth_login = g_strdup(rval); | |
| 751 } else if (strcmp(lval, "auth_secret") == 0) { | |
| 752 route->auth_secret = g_strdup(rval); | |
| 753 } | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
754 #else |
| 28 | 755 else if ((strcmp(lval, "auth_name") == 0) |
| 756 || (strcmp(lval, "auth_login") == 0) | |
| 757 || (strcmp(lval, "auth_secret") == 0)) { | |
| 758 logwrite(LOG_WARNING, "%s ignored: not compiled with auth support.\n", lval); | |
| 759 } | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
760 #endif |
|
190
6b4a101a2455
forgot to remove the pop3_login option in conf.c in the last commit
meillo@marmaro.de
parents:
178
diff
changeset
|
761 else if (strcmp(lval, "pipe") == 0) { |
| 28 | 762 route->pipe = g_strdup(rval); |
| 763 } else if (strcmp(lval, "pipe_fromline") == 0) { | |
| 764 route->pipe_fromline = parse_boolean(rval); | |
| 765 } else if (strcmp(lval, "pipe_fromhack") == 0) { | |
| 766 route->pipe_fromhack = parse_boolean(rval); | |
| 767 } else if (strcmp(lval, "last_route") == 0) { | |
| 768 route->last_route = parse_boolean(rval); | |
| 769 } else | |
| 770 logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval); | |
| 771 } | |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
772 |
| 319 | 773 if (!route->resolve_list) { |
| 28 | 774 #ifdef ENABLE_RESOLVER |
|
354
08932c629849
reworked the route concept; removed the idea of the localnet
markus schnalke <meillo@marmaro.de>
parents:
333
diff
changeset
|
775 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
|
776 route->resolve_list = g_list_append(route->resolve_list, resolve_dns_a); |
| 28 | 777 #endif |
| 319 | 778 route->resolve_list = g_list_append(route->resolve_list, resolve_byname); |
| 28 | 779 } |
| 780 fclose(in); | |
| 781 ok = TRUE; | |
| 782 | |
| 783 /* warn user about misconfigurations: */ | |
| 784 if ((route->map_h_from_addresses != NULL) && (route->set_h_from_domain != NULL)) { | |
| 785 logwrite(LOG_WARNING, "'map_h_from_addresses' overrides 'set_h_from_domain'\n"); | |
| 786 g_free(route->set_h_from_domain); | |
| 787 route->set_h_from_domain = NULL; | |
| 788 } | |
| 789 if ((route->map_h_reply_to_addresses != NULL) && (route->set_h_reply_to_domain != NULL)) { | |
| 790 logwrite(LOG_WARNING, "'map_h_reply_to_addresses' overrides 'set_h_reply_to_domain'\n"); | |
| 791 g_free(route->set_h_reply_to_domain); | |
| 792 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
|
793 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
794 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
795 if (!ok) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
796 g_free(route); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
797 route = NULL; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
798 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
799 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
800 return route; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
801 } |
| 0 | 802 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
803 static void |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
804 _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
|
805 { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
806 GList *node; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
807 if (list) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
808 foreach(list, node) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
809 g_free(node->data); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
810 g_list_free(list); |
| 0 | 811 } |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
812 } |
| 0 | 813 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
814 void |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
815 destroy_route(connect_route *r) |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
816 { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
817 if (r->filename) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
818 g_free(r->filename); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
819 if (r->mail_host) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
820 g_free(r->mail_host->address); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
821 g_free(r->mail_host); |
| 0 | 822 } |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
823 if (r->wrapper) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
824 g_free(r->wrapper); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
825 if (r->helo_name) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
826 g_free(r->helo_name); |
|
317
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
827 _g_list_free_all(r->allowed_senders); |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
828 _g_list_free_all(r->denied_senders); |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
829 _g_list_free_all(r->allowed_recipients); |
|
55b7bde95d37
reworked allowed and denied addrs for routes
meillo@marmaro.de
parents:
311
diff
changeset
|
830 _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
|
831 if (r->set_h_from_domain) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
832 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
|
833 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
|
834 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
|
835 if (r->set_return_path_domain) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
836 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
|
837 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
|
838 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
|
839 if (r->resolve_list) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
840 g_list_free(r->resolve_list); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
841 #ifdef ENABLE_AUTH |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
842 if (r->auth_name) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
843 g_free(r->auth_name); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
844 if (r->auth_login) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
845 g_free(r->auth_login); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
846 if (r->auth_secret) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
847 g_free(r->auth_secret); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
848 #endif |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
849 if (r->pipe) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
850 g_free(r->pipe); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
851 g_free(r); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
852 } |
| 0 | 853 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
854 GList* |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
855 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
|
856 { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
857 GList *list = NULL; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
858 GList *node; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
859 uid_t saved_uid, saved_gid; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
860 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
861 if (!conf.run_as_user) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
862 set_euidgid(0, 0, &saved_uid, &saved_gid); |
| 0 | 863 } |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
864 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
865 foreach(rf_list, node) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
866 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
|
867 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
|
868 if (route) |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
869 list = g_list_append(list, route); |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
870 else |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
871 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
|
872 } |
| 0 | 873 |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
874 /* set uid and gid back */ |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
875 if (!conf.run_as_user) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
876 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
|
877 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
878 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
879 return list; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
880 } |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
881 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
882 void |
|
366
41958685480d
Switched to `type *name' style
markus schnalke <meillo@marmaro.de>
parents:
359
diff
changeset
|
883 destroy_route_list(GList *list) |
|
10
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
884 { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
885 GList *node; |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
886 |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
887 foreach(list, node) { |
|
26e34ae9a3e3
changed indention and line wrapping to a more consistent style
meillo@marmaro.de
parents:
0
diff
changeset
|
888 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
|
889 destroy_route(route); |
| 0 | 890 } |
| 891 g_list_free(list); | |
| 892 } |