Mercurial > masqmail
comparison src/conf.c @ 262:fc1c6425c024
s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/
The constants are all to bulky.
We should have different, meaningful exit codes anyway.
author | markus schnalke <meillo@marmaro.de> |
---|---|
date | Thu, 02 Dec 2010 17:11:25 -0300 |
parents | 82d168dd52fd |
children | e0de950ed497 |
comparison
equal
deleted
inserted
replaced
261:0afe18a9ee03 | 262:fc1c6425c024 |
---|---|
37 | 37 |
38 if ((passwd = getpwnam(DEF_MAIL_USER))) | 38 if ((passwd = getpwnam(DEF_MAIL_USER))) |
39 conf.mail_uid = passwd->pw_uid; | 39 conf.mail_uid = passwd->pw_uid; |
40 else { | 40 else { |
41 fprintf(stderr, "user %s not found! (terminating)\n", DEF_MAIL_USER); | 41 fprintf(stderr, "user %s not found! (terminating)\n", DEF_MAIL_USER); |
42 exit(EXIT_FAILURE); | 42 exit(1); |
43 } | 43 } |
44 if ((group = getgrnam(DEF_MAIL_GROUP))) | 44 if ((group = getgrnam(DEF_MAIL_GROUP))) |
45 conf.mail_gid = group->gr_gid; | 45 conf.mail_gid = group->gr_gid; |
46 else { | 46 else { |
47 fprintf(stderr, "group %s not found! (terminating)\n", DEF_MAIL_GROUP); | 47 fprintf(stderr, "group %s not found! (terminating)\n", DEF_MAIL_GROUP); |
48 exit(EXIT_FAILURE); | 48 exit(1); |
49 } | 49 } |
50 } | 50 } |
51 | 51 |
52 static gchar* true_strings[] = { | 52 static gchar* true_strings[] = { |
53 "yes", "on", "true", NULL | 53 "yes", "on", "true", NULL |
77 return FALSE; | 77 return FALSE; |
78 str++; | 78 str++; |
79 } | 79 } |
80 | 80 |
81 fprintf(stderr, "cannot parse value '%s'\n", rval); | 81 fprintf(stderr, "cannot parse value '%s'\n", rval); |
82 exit(EXIT_FAILURE); | 82 exit(1); |
83 } | 83 } |
84 | 84 |
85 /* make a list from each line in a file */ | 85 /* make a list from each line in a file */ |
86 static GList* | 86 static GList* |
87 parse_list_file(gchar * fname) | 87 parse_list_file(gchar * fname) |
89 GList *list = NULL; | 89 GList *list = NULL; |
90 FILE *fptr; | 90 FILE *fptr; |
91 | 91 |
92 if ((fptr = fopen(fname, "rt")) == NULL) { | 92 if ((fptr = fopen(fname, "rt")) == NULL) { |
93 logwrite(LOG_ALERT, "could not open %s for reading: %s\n", fname, strerror(errno)); | 93 logwrite(LOG_ALERT, "could not open %s for reading: %s\n", fname, strerror(errno)); |
94 exit(EXIT_FAILURE); | 94 exit(1); |
95 } | 95 } |
96 | 96 |
97 gchar buf[256]; | 97 gchar buf[256]; |
98 | 98 |
99 while (!feof(fptr)) { | 99 while (!feof(fptr)) { |
183 } else if (strcmp(item, "dns_mx") == 0) { | 183 } else if (strcmp(item, "dns_mx") == 0) { |
184 res_list = g_list_append(res_list, resolve_dns_mx); | 184 res_list = g_list_append(res_list, resolve_dns_mx); |
185 #endif | 185 #endif |
186 } else { | 186 } else { |
187 logwrite(LOG_ALERT, "unknown resolver %s\n", item); | 187 logwrite(LOG_ALERT, "unknown resolver %s\n", item); |
188 exit(EXIT_FAILURE); | 188 exit(1); |
189 } | 189 } |
190 g_free(item); | 190 g_free(item); |
191 } | 191 } |
192 g_list_free(list); | 192 g_list_free(list); |
193 return res_list; | 193 return res_list; |
238 *(q++) = *(p++); | 238 *(q++) = *(p++); |
239 *q = '\0'; | 239 *q = '\0'; |
240 | 240 |
241 if ((addr.s_addr = inet_addr(buf)) == INADDR_NONE) { | 241 if ((addr.s_addr = inet_addr(buf)) == INADDR_NONE) { |
242 fprintf(stderr, "'%s' is not a valid address (must be ip)\n", buf); | 242 fprintf(stderr, "'%s' is not a valid address (must be ip)\n", buf); |
243 exit(EXIT_FAILURE); | 243 exit(1); |
244 } | 244 } |
245 | 245 |
246 if (*p) { | 246 if (*p) { |
247 guint i; | 247 guint i; |
248 p++; | 248 p++; |
249 i = atoi(p); | 249 i = atoi(p); |
250 if ((i >= 0) && (i <= 32)) | 250 if ((i >= 0) && (i <= 32)) |
251 n = i ? ~((1 << (32 - i)) - 1) : 0; | 251 n = i ? ~((1 << (32 - i)) - 1) : 0; |
252 else { | 252 else { |
253 fprintf(stderr, "'%d' is not a valid net mask (must be >= 0 and <= 32)\n", i); | 253 fprintf(stderr, "'%d' is not a valid net mask (must be >= 0 and <= 32)\n", i); |
254 exit(EXIT_FAILURE); | 254 exit(1); |
255 } | 255 } |
256 } else | 256 } else |
257 n = 0; | 257 n = 0; |
258 | 258 |
259 mask_addr.s_addr = htonl(n); | 259 mask_addr.s_addr = htonl(n); |