Mercurial > masqmail-0.2
comparison src/conf.c @ 28:71605f542ecc
flattened conditional nesting
author | meillo@marmaro.de |
---|---|
date | Thu, 06 May 2010 11:52:34 +0200 |
parents | a8f3424347dc |
children | a80ebfa16cd5 |
comparison
equal
deleted
inserted
replaced
27:3654c502a4df | 28:71605f542ecc |
---|---|
86 parse_list_file(gchar * fname) | 86 parse_list_file(gchar * fname) |
87 { | 87 { |
88 GList *list = NULL; | 88 GList *list = NULL; |
89 FILE *fptr; | 89 FILE *fptr; |
90 | 90 |
91 if ((fptr = fopen(fname, "rt"))) { | 91 if ((fptr = fopen(fname, "rt")) == NULL) { |
92 gchar buf[256]; | |
93 | |
94 while (!feof(fptr)) { | |
95 fgets(buf, 255, fptr); | |
96 if (buf[0] && (buf[0] != '#') && (buf[0] != '\n')) { | |
97 g_strchomp(buf); | |
98 list = g_list_append(list, g_strdup(buf)); | |
99 } | |
100 } | |
101 fclose(fptr); | |
102 } else { | |
103 logwrite(LOG_ALERT, "could not open %s for reading: %s\n", fname, strerror(errno)); | 92 logwrite(LOG_ALERT, "could not open %s for reading: %s\n", fname, strerror(errno)); |
104 exit(EXIT_FAILURE); | 93 exit(EXIT_FAILURE); |
105 } | 94 } |
95 | |
96 gchar buf[256]; | |
97 | |
98 while (!feof(fptr)) { | |
99 fgets(buf, 255, fptr); | |
100 if (buf[0] && (buf[0] != '#') && (buf[0] != '\n')) { | |
101 g_strchomp(buf); | |
102 list = g_list_append(list, g_strdup(buf)); | |
103 } | |
104 } | |
105 fclose(fptr); | |
106 | 106 |
107 return list; | 107 return list; |
108 } | 108 } |
109 | 109 |
110 /* given a semicolon separated string, this function makes a GList out of it. */ | 110 /* given a semicolon separated string, this function makes a GList out of it. */ |
165 GList *list; | 165 GList *list; |
166 GList *list_node; | 166 GList *list_node; |
167 GList *res_list = NULL; | 167 GList *res_list = NULL; |
168 | 168 |
169 list = parse_list(line, FALSE); | 169 list = parse_list(line, FALSE); |
170 if (list) { | 170 if (!list) { |
171 foreach(list, list_node) { | 171 return NULL; |
172 gchar *item = (gchar *) (list_node->data); | 172 } |
173 if (strcmp(item, "byname") == 0) { | 173 |
174 res_list = g_list_append(res_list, resolve_byname); | 174 foreach(list, list_node) { |
175 gchar *item = (gchar *) (list_node->data); | |
176 if (strcmp(item, "byname") == 0) { | |
177 res_list = g_list_append(res_list, resolve_byname); | |
175 #ifdef ENABLE_RESOLVER | 178 #ifdef ENABLE_RESOLVER |
176 } else if (strcmp(item, "dns_a") == 0) { | 179 } else if (strcmp(item, "dns_a") == 0) { |
177 res_list = g_list_append(res_list, resolve_dns_a); | 180 res_list = g_list_append(res_list, resolve_dns_a); |
178 } else if (strcmp(item, "dns_mx") == 0) { | 181 } else if (strcmp(item, "dns_mx") == 0) { |
179 res_list = g_list_append(res_list, resolve_dns_mx); | 182 res_list = g_list_append(res_list, resolve_dns_mx); |
180 #endif | 183 #endif |
181 } else { | 184 } else { |
182 logwrite(LOG_ALERT, "unknown resolver %s\n", item); | 185 logwrite(LOG_ALERT, "unknown resolver %s\n", item); |
183 exit(EXIT_FAILURE); | 186 exit(EXIT_FAILURE); |
184 } | 187 } |
185 g_free(item); | 188 g_free(item); |
186 } | 189 } |
187 g_list_free(list); | 190 g_list_free(list); |
188 } | |
189 return res_list; | 191 return res_list; |
190 } | 192 } |
191 | 193 |
192 static interface* | 194 static interface* |
193 parse_interface(gchar * line, gint def_port) | 195 parse_interface(gchar * line, gint def_port) |
231 q = buf; | 233 q = buf; |
232 while ((*p != '\0') && (*p != '/') && (q < buf + 255)) | 234 while ((*p != '\0') && (*p != '/') && (q < buf + 255)) |
233 *(q++) = *(p++); | 235 *(q++) = *(p++); |
234 *q = '\0'; | 236 *q = '\0'; |
235 | 237 |
236 if ((addr.s_addr = inet_addr(buf)) != INADDR_NONE) { | 238 if ((addr.s_addr = inet_addr(buf)) == INADDR_NONE) { |
237 if (*p) { | |
238 guint i; | |
239 p++; | |
240 i = atoi(p); | |
241 if ((i >= 0) && (i <= 32)) | |
242 n = i ? ~((1 << (32 - i)) - 1) : 0; | |
243 else { | |
244 fprintf(stderr, "'%d' is not a valid net mask (must be >= 0 and <= 32)\n", i); | |
245 exit(EXIT_FAILURE); | |
246 } | |
247 } else | |
248 n = 0; | |
249 | |
250 mask_addr.s_addr = htonl(n); | |
251 net_addr.s_addr = mask_addr.s_addr & addr.s_addr; | |
252 } else { | |
253 fprintf(stderr, "'%s' is not a valid address (must be ip)\n", buf); | 239 fprintf(stderr, "'%s' is not a valid address (must be ip)\n", buf); |
254 exit(EXIT_FAILURE); | 240 exit(EXIT_FAILURE); |
255 } | 241 } |
242 | |
243 if (*p) { | |
244 guint i; | |
245 p++; | |
246 i = atoi(p); | |
247 if ((i >= 0) && (i <= 32)) | |
248 n = i ? ~((1 << (32 - i)) - 1) : 0; | |
249 else { | |
250 fprintf(stderr, "'%d' is not a valid net mask (must be >= 0 and <= 32)\n", i); | |
251 exit(EXIT_FAILURE); | |
252 } | |
253 } else | |
254 n = 0; | |
255 | |
256 mask_addr.s_addr = htonl(n); | |
257 net_addr.s_addr = mask_addr.s_addr & addr.s_addr; | |
256 | 258 |
257 p_net_addr = g_malloc(sizeof(struct in_addr)); | 259 p_net_addr = g_malloc(sizeof(struct in_addr)); |
258 p_net_addr->s_addr = net_addr.s_addr; | 260 p_net_addr->s_addr = net_addr.s_addr; |
259 return p_net_addr; | 261 return p_net_addr; |
260 } | 262 } |
293 static gboolean | 295 static gboolean |
294 eat_spaces(FILE * in) | 296 eat_spaces(FILE * in) |
295 { | 297 { |
296 gint c; | 298 gint c; |
297 | 299 |
298 for (c = fgetc(in); c != EOF && isspace(c); c = fgetc(in)); | 300 for (c = fgetc(in); c != EOF && isspace(c); c = fgetc(in)) { |
301 /* empty */ | |
302 } | |
299 if (c == EOF) | 303 if (c == EOF) |
300 return FALSE; | 304 return FALSE; |
301 ungetc(c, in); | 305 ungetc(c, in); |
302 return TRUE; | 306 return TRUE; |
303 } | 307 } |
397 if (!eat_comments(in)) | 401 if (!eat_comments(in)) |
398 return FALSE; | 402 return FALSE; |
399 | 403 |
400 DEBUG(6) fprintf(stderr, "read_statement() 1\n"); | 404 DEBUG(6) fprintf(stderr, "read_statement() 1\n"); |
401 | 405 |
402 if (read_lval(in, lval, lsize)) { | 406 if (!read_lval(in, lval, lsize)) { |
403 DEBUG(6) fprintf(stderr, "lval = %s\n", lval); | 407 return FALSE; |
404 if ((c = fgetc(in) == '=')) { | 408 } |
405 if (read_rval(in, rval, rsize)) { | 409 |
406 DEBUG(6) fprintf(stderr, "rval = %s\n", rval); | 410 DEBUG(6) fprintf(stderr, "lval = %s\n", lval); |
407 return TRUE; | 411 if ((c = fgetc(in) == '=')) { |
408 } | 412 if (read_rval(in, rval, rsize)) { |
409 } else { | 413 DEBUG(6) fprintf(stderr, "rval = %s\n", rval); |
410 fprintf(stderr, "'=' expected after %s, char was '%c'\n", lval, c); | 414 return TRUE; |
411 } | 415 } |
416 } else { | |
417 fprintf(stderr, "'=' expected after %s, char was '%c'\n", lval, c); | |
412 } | 418 } |
413 return FALSE; | 419 return FALSE; |
414 } | 420 } |
415 | 421 |
416 gboolean | 422 gboolean |
422 conf.remote_port = 25; | 428 conf.remote_port = 25; |
423 conf.do_relay = TRUE; | 429 conf.do_relay = TRUE; |
424 conf.alias_local_cmp = strcmp; | 430 conf.alias_local_cmp = strcmp; |
425 conf.max_defer_time = 86400 * 4; /* 4 days */ | 431 conf.max_defer_time = 86400 * 4; /* 4 days */ |
426 | 432 |
427 if ((in = fopen(filename, "r"))) { | 433 if ((in = fopen(filename, "r")) == NULL) { |
428 gchar lval[256], rval[2048]; | 434 fprintf(stderr, "could not open config file %s: %s\n", filename, strerror(errno)); |
429 while (read_statement(in, lval, 256, rval, 2048)) { | 435 return FALSE; |
430 if (strcmp(lval, "debug_level") == 0) | 436 } |
431 conf.debug_level = atoi(rval); | 437 |
432 else if (strcmp(lval, "run_as_user") == 0) { | 438 gchar lval[256], rval[2048]; |
433 if (!conf.run_as_user) /* you should not be able to reset that flag */ | 439 while (read_statement(in, lval, 256, rval, 2048)) { |
434 conf.run_as_user = parse_boolean(rval); | 440 if (strcmp(lval, "debug_level") == 0) |
435 } else if (strcmp(lval, "use_syslog") == 0) | 441 conf.debug_level = atoi(rval); |
436 conf.use_syslog = parse_boolean(rval); | 442 else if (strcmp(lval, "run_as_user") == 0) { |
437 else if (strcmp(lval, "mail_dir") == 0) | 443 if (!conf.run_as_user) /* you should not be able to reset that flag */ |
438 conf.mail_dir = g_strdup(rval); | 444 conf.run_as_user = parse_boolean(rval); |
439 else if (strcmp(lval, "lock_dir") == 0) | 445 } else if (strcmp(lval, "use_syslog") == 0) |
440 conf.lock_dir = g_strdup(rval); | 446 conf.use_syslog = parse_boolean(rval); |
441 else if (strcmp(lval, "spool_dir") == 0) | 447 else if (strcmp(lval, "mail_dir") == 0) |
442 conf.spool_dir = g_strdup(rval); | 448 conf.mail_dir = g_strdup(rval); |
443 else if (strcmp(lval, "log_dir") == 0) | 449 else if (strcmp(lval, "lock_dir") == 0) |
444 conf.log_dir = g_strdup(rval); | 450 conf.lock_dir = g_strdup(rval); |
445 else if (strcmp(lval, "host_name") == 0) { | 451 else if (strcmp(lval, "spool_dir") == 0) |
446 if (rval[0] != '/') | 452 conf.spool_dir = g_strdup(rval); |
447 conf.host_name = g_strdup(rval); | 453 else if (strcmp(lval, "log_dir") == 0) |
448 else { | 454 conf.log_dir = g_strdup(rval); |
449 char buf[256]; | 455 else if (strcmp(lval, "host_name") == 0) { |
450 FILE *fptr = fopen(rval, "rt"); | 456 if (rval[0] != '/') |
451 if (fptr) { | 457 conf.host_name = g_strdup(rval); |
452 fgets(buf, 255, fptr); | 458 else { |
453 g_strchomp(buf); | 459 char buf[256]; |
454 conf.host_name = g_strdup(buf); | 460 FILE *fptr = fopen(rval, "rt"); |
455 fclose(fptr); | 461 if (fptr) { |
456 } else { | 462 fprintf(stderr, "could not open %s: %s\n", rval, strerror(errno)); |
457 fprintf(stderr, "could not open %s: %s\n", rval, | 463 return FALSE; |
458 strerror(errno)); | |
459 return FALSE; | |
460 } | |
461 } | 464 } |
462 } else if (strcmp(lval, "remote_port") == 0) { | 465 fgets(buf, 255, fptr); |
463 fprintf(stderr, "the remote_port option is now deprecated. Use 'mail_host' in the\n" | 466 g_strchomp(buf); |
464 "route configuration instead. See man masqmail.route\n"); | 467 conf.host_name = g_strdup(buf); |
465 conf.remote_port = atoi(rval); | 468 fclose(fptr); |
466 } else if (strcmp(lval, "local_hosts") == 0) | 469 } |
467 conf.local_hosts = parse_list(rval, FALSE); | 470 } else if (strcmp(lval, "remote_port") == 0) { |
468 else if (strcmp(lval, "local_addresses") == 0) | 471 fprintf(stderr, "the remote_port option is now deprecated. Use 'mail_host' in the\n" |
469 conf.local_addresses = parse_list(rval, TRUE); | 472 "route configuration instead. See man masqmail.route\n"); |
470 else if (strcmp(lval, "not_local_addresses") == 0) | 473 conf.remote_port = atoi(rval); |
471 conf.not_local_addresses = parse_list(rval, TRUE); | 474 } else if (strcmp(lval, "local_hosts") == 0) |
472 else if (strcmp(lval, "local_nets") == 0) | 475 conf.local_hosts = parse_list(rval, FALSE); |
473 conf.local_nets = parse_list(rval, FALSE); | 476 else if (strcmp(lval, "local_addresses") == 0) |
474 else if (strcmp(lval, "do_save_envelope_to") == 0) | 477 conf.local_addresses = parse_list(rval, TRUE); |
475 conf.do_save_envelope_to = parse_boolean(rval); | 478 else if (strcmp(lval, "not_local_addresses") == 0) |
476 else if (strcmp(lval, "defer_all") == 0) | 479 conf.not_local_addresses = parse_list(rval, TRUE); |
477 conf.defer_all = parse_boolean(rval); | 480 else if (strcmp(lval, "local_nets") == 0) |
478 else if (strcmp(lval, "do_relay") == 0) | 481 conf.local_nets = parse_list(rval, FALSE); |
479 conf.do_relay = parse_boolean(rval); | 482 else if (strcmp(lval, "do_save_envelope_to") == 0) |
480 else if (strcmp(lval, "alias_file") == 0) { | 483 conf.do_save_envelope_to = parse_boolean(rval); |
481 conf.alias_file = g_strdup(rval); | 484 else if (strcmp(lval, "defer_all") == 0) |
482 } else if (strcmp(lval, "alias_local_caseless") == 0) { | 485 conf.defer_all = parse_boolean(rval); |
483 conf.alias_local_cmp = parse_boolean(rval) ? strcasecmp : strcmp; | 486 else if (strcmp(lval, "do_relay") == 0) |
484 } else if (strcmp(lval, "mbox_default") == 0) { | 487 conf.do_relay = parse_boolean(rval); |
485 conf.mbox_default = g_strdup(rval); | 488 else if (strcmp(lval, "alias_file") == 0) { |
486 } else if (strcmp(lval, "mbox_users") == 0) { | 489 conf.alias_file = g_strdup(rval); |
487 conf.mbox_users = parse_list(rval, TRUE); | 490 } else if (strcmp(lval, "alias_local_caseless") == 0) { |
488 } else if (strcmp(lval, "mda_users") == 0) { | 491 conf.alias_local_cmp = parse_boolean(rval) ? strcasecmp : strcmp; |
489 conf.mda_users = parse_list(rval, TRUE); | 492 } else if (strcmp(lval, "mbox_default") == 0) { |
490 } else if (strcmp(lval, "maildir_users") == 0) { | 493 conf.mbox_default = g_strdup(rval); |
491 conf.maildir_users = parse_list(rval, TRUE); | 494 } else if (strcmp(lval, "mbox_users") == 0) { |
492 } else if (strcmp(lval, "mda") == 0) { | 495 conf.mbox_users = parse_list(rval, TRUE); |
493 conf.mda = g_strdup(rval); | 496 } else if (strcmp(lval, "mda_users") == 0) { |
494 } else if (strcmp(lval, "mda_fromline") == 0) { | 497 conf.mda_users = parse_list(rval, TRUE); |
495 conf.mda_fromline = parse_boolean(rval); | 498 } else if (strcmp(lval, "maildir_users") == 0) { |
496 } else if (strcmp(lval, "mda_fromhack") == 0) { | 499 conf.maildir_users = parse_list(rval, TRUE); |
497 conf.mda_fromhack = parse_boolean(rval); | 500 } else if (strcmp(lval, "mda") == 0) { |
498 } else if (strcmp(lval, "pipe_fromline") == 0) { | 501 conf.mda = g_strdup(rval); |
499 conf.pipe_fromline = parse_boolean(rval); | 502 } else if (strcmp(lval, "mda_fromline") == 0) { |
500 } else if (strcmp(lval, "pipe_fromhack") == 0) { | 503 conf.mda_fromline = parse_boolean(rval); |
501 conf.pipe_fromhack = parse_boolean(rval); | 504 } else if (strcmp(lval, "mda_fromhack") == 0) { |
502 } else if (strcmp(lval, "listen_addresses") == 0) { | 505 conf.mda_fromhack = parse_boolean(rval); |
503 GList *node; | 506 } else if (strcmp(lval, "pipe_fromline") == 0) { |
504 GList *tmp_list = parse_list(rval, FALSE); | 507 conf.pipe_fromline = parse_boolean(rval); |
505 | 508 } else if (strcmp(lval, "pipe_fromhack") == 0) { |
506 conf.listen_addresses = NULL; | 509 conf.pipe_fromhack = parse_boolean(rval); |
507 foreach(tmp_list, node) { | 510 } else if (strcmp(lval, "listen_addresses") == 0) { |
508 conf.listen_addresses = g_list_append(conf.listen_addresses, parse_interface((gchar *) (node-> data), 25)); | 511 GList *node; |
509 g_free(node->data); | 512 GList *tmp_list = parse_list(rval, FALSE); |
510 } | 513 |
511 g_list_free(tmp_list); | 514 conf.listen_addresses = NULL; |
512 } else if (strcmp(lval, "ident_trusted_nets") == 0) { | 515 foreach(tmp_list, node) { |
516 conf.listen_addresses = g_list_append(conf.listen_addresses, parse_interface((gchar *) (node-> data), 25)); | |
517 g_free(node->data); | |
518 } | |
519 g_list_free(tmp_list); | |
520 } else if (strcmp(lval, "ident_trusted_nets") == 0) { | |
513 #ifdef ENABLE_IDENT | 521 #ifdef ENABLE_IDENT |
514 GList *node; | 522 GList *node; |
515 GList *tmp_list = parse_list(rval, FALSE); | 523 GList *tmp_list = parse_list(rval, FALSE); |
516 | 524 |
517 conf.ident_trusted_nets = NULL; | 525 conf.ident_trusted_nets = NULL; |
518 foreach(tmp_list, node) { | 526 foreach(tmp_list, node) { |
519 conf.ident_trusted_nets = g_list_append(conf.ident_trusted_nets, parse_network((gchar *) (node->data), 25)); | 527 conf.ident_trusted_nets = g_list_append(conf.ident_trusted_nets, parse_network((gchar *) (node->data), 25)); |
520 g_free(node->data); | 528 g_free(node->data); |
521 } | 529 } |
522 g_list_free(tmp_list); | 530 g_list_free(tmp_list); |
523 #else | 531 #else |
524 fprintf(stderr, "%s ignored: not compiled with ident support\n", lval); | 532 fprintf(stderr, "%s ignored: not compiled with ident support\n", lval); |
525 #endif | 533 #endif |
526 } else if ((strncmp(lval, "connect_route.", 14) == 0) | 534 } else if ((strncmp(lval, "connect_route.", 14) == 0) |
527 || (strncmp(lval, "online_routes.", 14) == 0)) { | 535 || (strncmp(lval, "online_routes.", 14) == 0)) { |
528 GList *file_list = parse_list(rval, FALSE); | 536 GList *file_list = parse_list(rval, FALSE); |
529 table_pair *pair = create_pair(&(lval[14]), file_list); | 537 table_pair *pair = create_pair(&(lval[14]), file_list); |
530 conf.connect_routes = g_list_append(conf.connect_routes, pair); | 538 conf.connect_routes = g_list_append(conf.connect_routes, pair); |
531 } else if (strcmp(lval, "local_net_route") == 0) { | 539 } else if (strcmp(lval, "local_net_route") == 0) { |
532 conf.local_net_routes = parse_list(rval, FALSE); | 540 conf.local_net_routes = parse_list(rval, FALSE); |
533 } else if (strcmp(lval, "online_detect") == 0) | 541 } else if (strcmp(lval, "online_detect") == 0) |
534 conf.online_detect = g_strdup(rval); | 542 conf.online_detect = g_strdup(rval); |
535 else if (strcmp(lval, "online_file") == 0) | 543 else if (strcmp(lval, "online_file") == 0) |
536 conf.online_file = g_strdup(rval); | 544 conf.online_file = g_strdup(rval); |
537 else if (strcmp(lval, "online_pipe") == 0) | 545 else if (strcmp(lval, "online_pipe") == 0) |
538 conf.online_pipe = g_strdup(rval); | 546 conf.online_pipe = g_strdup(rval); |
539 else if (strcmp(lval, "mserver_iface") == 0) | 547 else if (strcmp(lval, "mserver_iface") == 0) |
540 conf.mserver_iface = parse_interface(rval, 224); | 548 conf.mserver_iface = parse_interface(rval, 224); |
541 else if (strcmp(lval, "do_queue") == 0) | 549 else if (strcmp(lval, "do_queue") == 0) |
542 conf.do_queue = parse_boolean(rval); | 550 conf.do_queue = parse_boolean(rval); |
543 else if (strncmp(lval, "get.", 4) == 0) { | 551 else if (strncmp(lval, "get.", 4) == 0) { |
544 #ifdef ENABLE_POP3 | 552 #ifdef ENABLE_POP3 |
545 table_pair *pair = create_pair_string(&(lval[4]), rval); | 553 table_pair *pair = create_pair_string(&(lval[4]), rval); |
546 conf.get_names = g_list_append(conf.get_names, pair); | 554 conf.get_names = g_list_append(conf.get_names, pair); |
547 #else | 555 #else |
548 fprintf(stderr, "get.<name> ignored: not compiled with pop support\n"); | 556 fprintf(stderr, "get.<name> ignored: not compiled with pop support\n"); |
549 #endif | 557 #endif |
550 } else if (strncmp(lval, "online_gets.", 12) == 0) { | 558 } else if (strncmp(lval, "online_gets.", 12) == 0) { |
551 #ifdef ENABLE_POP3 | 559 #ifdef ENABLE_POP3 |
552 GList *file_list = parse_list(rval, FALSE); | 560 GList *file_list = parse_list(rval, FALSE); |
553 table_pair *pair = create_pair(&(lval[12]), file_list); | 561 table_pair *pair = create_pair(&(lval[12]), file_list); |
554 conf.online_gets = g_list_append(conf.online_gets, pair); | 562 conf.online_gets = g_list_append(conf.online_gets, pair); |
555 #else | 563 #else |
556 fprintf(stderr, "online_gets.<name> ignored: not compiled with pop support\n"); | 564 fprintf(stderr, "online_gets.<name> ignored: not compiled with pop support\n"); |
557 #endif | 565 #endif |
558 } else if (strcmp(lval, "errmsg_file") == 0) | 566 } else if (strcmp(lval, "errmsg_file") == 0) |
559 conf.errmsg_file = g_strdup(rval); | 567 conf.errmsg_file = g_strdup(rval); |
560 else if (strcmp(lval, "warnmsg_file") == 0) | 568 else if (strcmp(lval, "warnmsg_file") == 0) |
561 conf.warnmsg_file = g_strdup(rval); | 569 conf.warnmsg_file = g_strdup(rval); |
562 else if (strcmp(lval, "warn_intervals") == 0) | 570 else if (strcmp(lval, "warn_intervals") == 0) |
563 conf.warn_intervals = parse_list(rval, FALSE); | 571 conf.warn_intervals = parse_list(rval, FALSE); |
564 else if (strcmp(lval, "max_defer_time") == 0) { | 572 else if (strcmp(lval, "max_defer_time") == 0) { |
565 gint dummy; | 573 gint dummy; |
566 gint ival = time_interval(rval, &dummy); | 574 gint ival = time_interval(rval, &dummy); |
567 if (ival < 0) | 575 if (ival < 0) |
568 fprintf(stderr, "invalid time interval for 'max_defer_time': %s\n", rval); | 576 fprintf(stderr, "invalid time interval for 'max_defer_time': %s\n", rval); |
569 else | |
570 conf.max_defer_time = ival; | |
571 } else if (strcmp(lval, "log_user") == 0) | |
572 conf.log_user = g_strdup(rval); | |
573 | |
574 else | 577 else |
575 fprintf(stderr, "var '%s' not (yet) known, ignored\n", lval); | 578 conf.max_defer_time = ival; |
576 } | 579 } else if (strcmp(lval, "log_user") == 0) |
577 fclose(in); | 580 conf.log_user = g_strdup(rval); |
578 | 581 |
579 if (conf.errmsg_file == NULL) | 582 else |
580 conf.errmsg_file = g_strdup(DATA_DIR "/tpl/failmsg.tpl"); | 583 fprintf(stderr, "var '%s' not (yet) known, ignored\n", lval); |
581 if (conf.warnmsg_file == NULL) | 584 } |
582 conf.warnmsg_file = g_strdup(DATA_DIR "/tpl/warnmsg.tpl"); | 585 fclose(in); |
583 | 586 |
584 if (conf.lock_dir == NULL) | 587 if (conf.errmsg_file == NULL) |
585 conf.lock_dir = g_strdup_printf("%s/lock/", conf.spool_dir); | 588 conf.errmsg_file = g_strdup(DATA_DIR "/tpl/failmsg.tpl"); |
586 | 589 if (conf.warnmsg_file == NULL) |
587 if (conf.mbox_default == NULL) | 590 conf.warnmsg_file = g_strdup(DATA_DIR "/tpl/warnmsg.tpl"); |
588 conf.mbox_default = g_strdup("mbox"); | 591 |
589 | 592 if (conf.lock_dir == NULL) |
590 if (conf.warn_intervals == NULL) | 593 conf.lock_dir = g_strdup_printf("%s/lock/", conf.spool_dir); |
591 conf.warn_intervals = parse_list("1h;4h;8h;1d;2d;3d", FALSE); | 594 |
592 | 595 if (conf.mbox_default == NULL) |
593 return TRUE; | 596 conf.mbox_default = g_strdup("mbox"); |
594 } else | 597 |
595 fprintf(stderr, "could not open config file %s: %s\n", filename, strerror(errno)); | 598 if (conf.warn_intervals == NULL) |
596 return FALSE; | 599 conf.warn_intervals = parse_list("1h;4h;8h;1d;2d;3d", FALSE); |
600 | |
601 return TRUE; | |
597 } | 602 } |
598 | 603 |
599 connect_route* | 604 connect_route* |
600 read_route(gchar * filename, gboolean is_local_net) | 605 read_route(gchar * filename, gboolean is_local_net) |
601 { | 606 { |
615 | 620 |
616 route->is_local_net = is_local_net; | 621 route->is_local_net = is_local_net; |
617 | 622 |
618 route->do_pipelining = TRUE; | 623 route->do_pipelining = TRUE; |
619 | 624 |
620 if ((in = fopen(route->filename, "r"))) { | 625 if ((in = fopen(route->filename, "r")) == NULL) { |
621 gchar lval[256], rval[2048]; | 626 logwrite(LOG_ALERT, "could not open route file %s: %s\n", route->filename, strerror(errno)); |
622 while (read_statement(in, lval, 256, rval, 2048)) { | 627 g_free(route); |
623 if (strcmp(lval, "protocol") == 0) | 628 return NULL; |
624 route->protocol = g_strdup(rval); | 629 } |
625 else if (strcmp(lval, "mail_host") == 0) | 630 |
626 route->mail_host = parse_interface(rval, conf.remote_port); | 631 gchar lval[256], rval[2048]; |
627 else if (strcmp(lval, "helo_name") == 0) | 632 while (read_statement(in, lval, 256, rval, 2048)) { |
628 route->helo_name = g_strdup(rval); | 633 if (strcmp(lval, "protocol") == 0) |
629 else if (strcmp(lval, "wrapper") == 0) | 634 route->protocol = g_strdup(rval); |
630 route->wrapper = g_strdup(rval); | 635 else if (strcmp(lval, "mail_host") == 0) |
631 else if (strcmp(lval, "connect_error_fail") == 0) | 636 route->mail_host = parse_interface(rval, conf.remote_port); |
632 route->connect_error_fail = parse_boolean(rval); | 637 else if (strcmp(lval, "helo_name") == 0) |
633 else if (strcmp(lval, "do_correct_helo") == 0) | 638 route->helo_name = g_strdup(rval); |
634 route->do_correct_helo = parse_boolean(rval); | 639 else if (strcmp(lval, "wrapper") == 0) |
635 else if (strcmp(lval, "do_pipelining") == 0) | 640 route->wrapper = g_strdup(rval); |
636 route->do_pipelining = parse_boolean(rval); | 641 else if (strcmp(lval, "connect_error_fail") == 0) |
637 else if (strcmp(lval, "allowed_return_paths") == 0) | 642 route->connect_error_fail = parse_boolean(rval); |
638 route->allowed_return_paths = parse_address_list(rval, TRUE); | 643 else if (strcmp(lval, "do_correct_helo") == 0) |
639 else if (strcmp(lval, "allowed_mail_locals") == 0) | 644 route->do_correct_helo = parse_boolean(rval); |
640 route->allowed_mail_locals = parse_list(rval, TRUE); | 645 else if (strcmp(lval, "do_pipelining") == 0) |
641 else if (strcmp(lval, "not_allowed_return_paths") == 0) | 646 route->do_pipelining = parse_boolean(rval); |
642 route->not_allowed_return_paths = parse_address_list(rval, TRUE); | 647 else if (strcmp(lval, "allowed_return_paths") == 0) |
643 else if (strcmp(lval, "not_allowed_mail_locals") == 0) | 648 route->allowed_return_paths = parse_address_list(rval, TRUE); |
644 route->not_allowed_mail_locals = parse_list(rval, TRUE); | 649 else if (strcmp(lval, "allowed_mail_locals") == 0) |
645 else if (strcmp(lval, "allowed_rcpt_domains") == 0) | 650 route->allowed_mail_locals = parse_list(rval, TRUE); |
646 route->allowed_rcpt_domains = parse_list(rval, TRUE); | 651 else if (strcmp(lval, "not_allowed_return_paths") == 0) |
647 else if (strcmp(lval, "not_allowed_rcpt_domains") == 0) | 652 route->not_allowed_return_paths = parse_address_list(rval, TRUE); |
648 route->not_allowed_rcpt_domains = parse_list(rval, TRUE); | 653 else if (strcmp(lval, "not_allowed_mail_locals") == 0) |
649 else if (strcmp(lval, "set_h_from_domain") == 0) | 654 route->not_allowed_mail_locals = parse_list(rval, TRUE); |
650 route->set_h_from_domain = g_strdup(rval); | 655 else if (strcmp(lval, "allowed_rcpt_domains") == 0) |
651 else if (strcmp(lval, "set_h_reply_to_domain") == 0) | 656 route->allowed_rcpt_domains = parse_list(rval, TRUE); |
652 route->set_h_reply_to_domain = g_strdup(rval); | 657 else if (strcmp(lval, "not_allowed_rcpt_domains") == 0) |
653 else if (strcmp(lval, "set_return_path_domain") == 0) | 658 route->not_allowed_rcpt_domains = parse_list(rval, TRUE); |
654 route->set_return_path_domain = g_strdup(rval); | 659 else if (strcmp(lval, "set_h_from_domain") == 0) |
655 else if (strcmp(lval, "map_return_path_addresses") == 0) { | 660 route->set_h_from_domain = g_strdup(rval); |
656 GList *node, *list; | 661 else if (strcmp(lval, "set_h_reply_to_domain") == 0) |
657 | 662 route->set_h_reply_to_domain = g_strdup(rval); |
658 list = parse_list(rval, TRUE); | 663 else if (strcmp(lval, "set_return_path_domain") == 0) |
659 foreach(list, node) { | 664 route->set_return_path_domain = g_strdup(rval); |
660 gchar *item = (gchar *) (node->data); | 665 else if (strcmp(lval, "map_return_path_addresses") == 0) { |
661 table_pair *pair = parse_table_pair(item, ':'); | 666 GList *node, *list; |
662 address *addr = create_address((gchar *) (pair->value), TRUE); | 667 |
663 g_free(pair->value); | 668 list = parse_list(rval, TRUE); |
664 pair->value = (gpointer *) addr; | 669 foreach(list, node) { |
665 route->map_return_path_addresses = g_list_append(route->map_return_path_addresses, pair); | 670 gchar *item = (gchar *) (node->data); |
666 g_free(item); | 671 table_pair *pair = parse_table_pair(item, ':'); |
667 } | 672 address *addr = create_address((gchar *) (pair->value), TRUE); |
668 g_list_free(list); | 673 g_free(pair->value); |
669 } else if (strcmp(lval, "map_h_from_addresses") == 0) { | 674 pair->value = (gpointer *) addr; |
670 GList *list, *node; | 675 route->map_return_path_addresses = g_list_append(route->map_return_path_addresses, pair); |
671 | 676 g_free(item); |
672 list = parse_list(rval, TRUE); | |
673 foreach(list, node) { | |
674 gchar *item = (gchar *) (node->data); | |
675 table_pair *pair = parse_table_pair(item, ':'); | |
676 route->map_h_from_addresses = g_list_append(route->map_h_from_addresses, pair); | |
677 g_free(item); | |
678 } | |
679 g_list_free(list); | |
680 } else if (strcmp(lval, "map_h_reply_to_addresses") == 0) { | |
681 GList *list, *node; | |
682 | |
683 list = parse_list(rval, TRUE); | |
684 foreach(list, node) { | |
685 gchar *item = (gchar *) (node->data); | |
686 table_pair *pair = parse_table_pair(item, ':'); | |
687 route->map_h_reply_to_addresses = g_list_append(route->map_h_reply_to_addresses, pair); | |
688 g_free(item); | |
689 } | |
690 g_list_free(list); | |
691 } else if (strcmp(lval, "map_h_mail_followup_to_addresses") == 0) { | |
692 GList *list, *node; | |
693 | |
694 list = parse_list(rval, TRUE); | |
695 foreach(list, node) { | |
696 gchar *item = (gchar *) (node->data); | |
697 table_pair *pair = parse_table_pair(item, ':'); | |
698 route->map_h_mail_followup_to_addresses = g_list_append(route->map_h_mail_followup_to_addresses, pair); | |
699 g_free(item); | |
700 } | |
701 g_list_free(list); | |
702 } else if (strcmp(lval, "expand_h_sender_domain") == 0) { | |
703 route->expand_h_sender_domain = parse_boolean(rval); | |
704 } else if (strcmp(lval, "expand_h_sender_address") == 0) { | |
705 route->expand_h_sender_address = parse_boolean(rval); | |
706 } else if (strcmp(lval, "resolve_list") == 0) | |
707 route->resolve_list = parse_resolve_list(rval); | |
708 else if (strcmp(lval, "do_ssl") == 0) { | |
709 /* we ignore this. This option is used by sqilconf */ | |
710 ; | |
711 } | 677 } |
678 g_list_free(list); | |
679 } else if (strcmp(lval, "map_h_from_addresses") == 0) { | |
680 GList *list, *node; | |
681 | |
682 list = parse_list(rval, TRUE); | |
683 foreach(list, node) { | |
684 gchar *item = (gchar *) (node->data); | |
685 table_pair *pair = parse_table_pair(item, ':'); | |
686 route->map_h_from_addresses = g_list_append(route->map_h_from_addresses, pair); | |
687 g_free(item); | |
688 } | |
689 g_list_free(list); | |
690 } else if (strcmp(lval, "map_h_reply_to_addresses") == 0) { | |
691 GList *list, *node; | |
692 | |
693 list = parse_list(rval, TRUE); | |
694 foreach(list, node) { | |
695 gchar *item = (gchar *) (node->data); | |
696 table_pair *pair = parse_table_pair(item, ':'); | |
697 route->map_h_reply_to_addresses = g_list_append(route->map_h_reply_to_addresses, pair); | |
698 g_free(item); | |
699 } | |
700 g_list_free(list); | |
701 } else if (strcmp(lval, "map_h_mail_followup_to_addresses") == 0) { | |
702 GList *list, *node; | |
703 | |
704 list = parse_list(rval, TRUE); | |
705 foreach(list, node) { | |
706 gchar *item = (gchar *) (node->data); | |
707 table_pair *pair = parse_table_pair(item, ':'); | |
708 route->map_h_mail_followup_to_addresses = g_list_append(route->map_h_mail_followup_to_addresses, pair); | |
709 g_free(item); | |
710 } | |
711 g_list_free(list); | |
712 } else if (strcmp(lval, "expand_h_sender_domain") == 0) { | |
713 route->expand_h_sender_domain = parse_boolean(rval); | |
714 } else if (strcmp(lval, "expand_h_sender_address") == 0) { | |
715 route->expand_h_sender_address = parse_boolean(rval); | |
716 } else if (strcmp(lval, "resolve_list") == 0) | |
717 route->resolve_list = parse_resolve_list(rval); | |
718 else if (strcmp(lval, "do_ssl") == 0) { | |
719 /* we ignore this. This option is used by sqilconf */ | |
720 ; | |
721 } | |
712 #ifdef ENABLE_AUTH | 722 #ifdef ENABLE_AUTH |
713 else if (strcmp(lval, "auth_name") == 0) { | 723 else if (strcmp(lval, "auth_name") == 0) { |
714 route->auth_name = g_strdup(rval); | 724 route->auth_name = g_strdup(rval); |
715 } else if (strcmp(lval, "auth_login") == 0) { | 725 } else if (strcmp(lval, "auth_login") == 0) { |
716 route->auth_login = g_strdup(rval); | 726 route->auth_login = g_strdup(rval); |
717 } else if (strcmp(lval, "auth_secret") == 0) { | 727 } else if (strcmp(lval, "auth_secret") == 0) { |
718 route->auth_secret = g_strdup(rval); | 728 route->auth_secret = g_strdup(rval); |
719 } | 729 } |
720 #else | 730 #else |
721 else if ((strcmp(lval, "auth_name") == 0) | 731 else if ((strcmp(lval, "auth_name") == 0) |
722 || (strcmp(lval, "auth_login") == 0) | 732 || (strcmp(lval, "auth_login") == 0) |
723 || (strcmp(lval, "auth_secret") == 0)) { | 733 || (strcmp(lval, "auth_secret") == 0)) { |
724 logwrite(LOG_WARNING, "%s ignored: not compiled with auth support.\n", lval); | 734 logwrite(LOG_WARNING, "%s ignored: not compiled with auth support.\n", lval); |
725 } | 735 } |
726 #endif | 736 #endif |
727 else if (strcmp(lval, "pop3_login") == 0) { | 737 else if (strcmp(lval, "pop3_login") == 0) { |
728 #ifdef ENABLE_POP3 | 738 #ifdef ENABLE_POP3 |
729 route->pop3_login = g_strdup(rval); | 739 route->pop3_login = g_strdup(rval); |
730 #else | 740 #else |
731 logwrite(LOG_WARNING, "pop3_login ignored: not compiled with pop support.\n"); | 741 logwrite(LOG_WARNING, "pop3_login ignored: not compiled with pop support.\n"); |
732 #endif | 742 #endif |
733 } else if (strcmp(lval, "pipe") == 0) { | 743 } else if (strcmp(lval, "pipe") == 0) { |
734 route->pipe = g_strdup(rval); | 744 route->pipe = g_strdup(rval); |
735 } else if (strcmp(lval, "pipe_fromline") == 0) { | 745 } else if (strcmp(lval, "pipe_fromline") == 0) { |
736 route->pipe_fromline = parse_boolean(rval); | 746 route->pipe_fromline = parse_boolean(rval); |
737 } else if (strcmp(lval, "pipe_fromhack") == 0) { | 747 } else if (strcmp(lval, "pipe_fromhack") == 0) { |
738 route->pipe_fromhack = parse_boolean(rval); | 748 route->pipe_fromhack = parse_boolean(rval); |
739 } else if (strcmp(lval, "last_route") == 0) { | 749 } else if (strcmp(lval, "last_route") == 0) { |
740 route->last_route = parse_boolean(rval); | 750 route->last_route = parse_boolean(rval); |
741 } else | 751 } else |
742 logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval); | 752 logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval); |
743 } | 753 } |
744 | 754 |
745 if (route->resolve_list == NULL) { | 755 if (route->resolve_list == NULL) { |
746 if (is_local_net) { | 756 if (is_local_net) { |
747 route->resolve_list = g_list_append(NULL, resolve_byname); | 757 route->resolve_list = g_list_append(NULL, resolve_byname); |
748 } else { | 758 } else { |
749 #ifdef ENABLE_RESOLVER | 759 #ifdef ENABLE_RESOLVER |
750 route->resolve_list = g_list_append(route->resolve_list, resolve_dns_mx); | 760 route->resolve_list = g_list_append(route->resolve_list, resolve_dns_mx); |
751 route->resolve_list = g_list_append(route->resolve_list, resolve_dns_a); | 761 route->resolve_list = g_list_append(route->resolve_list, resolve_dns_a); |
752 #endif | 762 #endif |
753 route->resolve_list = g_list_append(route->resolve_list, resolve_byname); | 763 route->resolve_list = g_list_append(route->resolve_list, resolve_byname); |
754 } | 764 } |
755 } | 765 } |
756 fclose(in); | 766 fclose(in); |
757 ok = TRUE; | 767 ok = TRUE; |
758 | 768 |
759 /* warn user about misconfigurations: */ | 769 /* warn user about misconfigurations: */ |
760 if ((route->map_h_from_addresses != NULL) | 770 if ((route->map_h_from_addresses != NULL) && (route->set_h_from_domain != NULL)) { |
761 && (route->set_h_from_domain != NULL)) { | 771 logwrite(LOG_WARNING, "'map_h_from_addresses' overrides 'set_h_from_domain'\n"); |
762 logwrite(LOG_WARNING, "'map_h_from_addresses' overrides 'set_h_from_domain'\n"); | 772 g_free(route->set_h_from_domain); |
763 g_free(route->set_h_from_domain); | 773 route->set_h_from_domain = NULL; |
764 route->set_h_from_domain = NULL; | 774 } |
765 } | 775 if ((route->map_h_reply_to_addresses != NULL) && (route->set_h_reply_to_domain != NULL)) { |
766 if ((route->map_h_reply_to_addresses != NULL) | 776 logwrite(LOG_WARNING, "'map_h_reply_to_addresses' overrides 'set_h_reply_to_domain'\n"); |
767 && (route->set_h_reply_to_domain != NULL)) { | 777 g_free(route->set_h_reply_to_domain); |
768 logwrite(LOG_WARNING, "'map_h_reply_to_addresses' overrides 'set_h_reply_to_domain'\n"); | 778 route->set_h_reply_to_domain = NULL; |
769 g_free(route->set_h_reply_to_domain); | |
770 route->set_h_reply_to_domain = NULL; | |
771 } | |
772 } else { | |
773 logwrite(LOG_ALERT, "could not open route file %s: %s\n", route->filename, strerror(errno)); | |
774 } | 779 } |
775 | 780 |
776 if (!ok) { | 781 if (!ok) { |
777 g_free(route); | 782 g_free(route); |
778 route = NULL; | 783 route = NULL; |
888 get_conf *gc = g_malloc(sizeof(get_conf)); | 893 get_conf *gc = g_malloc(sizeof(get_conf)); |
889 memset(gc, 0, sizeof(get_conf)); | 894 memset(gc, 0, sizeof(get_conf)); |
890 | 895 |
891 gc->server_port = 110; | 896 gc->server_port = 110; |
892 | 897 |
893 if ((in = fopen(filename, "r"))) { | 898 if ((in = fopen(filename, "r")) == NULL) { |
894 gchar lval[256], rval[2048]; | 899 logwrite(LOG_ALERT, "could not open get file %s: %s\n", filename, strerror(errno)); |
895 while (read_statement(in, lval, 256, rval, 2048)) { | 900 g_free(gc); |
896 if (strcmp(lval, "protocol") == 0) | 901 return NULL; |
897 gc->protocol = g_strdup(rval); | 902 } |
898 else if (strcmp(lval, "server") == 0) | 903 |
899 gc->server_name = g_strdup(rval); | 904 gchar lval[256], rval[2048]; |
900 else if (strcmp(lval, "port") == 0) | 905 while (read_statement(in, lval, 256, rval, 2048)) { |
901 gc->server_port = atoi(rval); | 906 if (strcmp(lval, "protocol") == 0) |
902 else if (strcmp(lval, "wrapper") == 0) | 907 gc->protocol = g_strdup(rval); |
903 gc->wrapper = g_strdup(rval); | 908 else if (strcmp(lval, "server") == 0) |
904 else if (strcmp(lval, "user") == 0) | 909 gc->server_name = g_strdup(rval); |
905 gc->login_user = g_strdup(rval); | 910 else if (strcmp(lval, "port") == 0) |
906 else if (strcmp(lval, "pass") == 0) | 911 gc->server_port = atoi(rval); |
907 gc->login_pass = g_strdup(rval); | 912 else if (strcmp(lval, "wrapper") == 0) |
908 else if (strcmp(lval, "address") == 0) | 913 gc->wrapper = g_strdup(rval); |
909 gc->address = create_address_qualified(rval, TRUE, conf.host_name); | 914 else if (strcmp(lval, "user") == 0) |
910 else if (strcmp(lval, "return_path") == 0) | 915 gc->login_user = g_strdup(rval); |
911 gc->return_path = create_address_qualified(rval, TRUE, conf.host_name); | 916 else if (strcmp(lval, "pass") == 0) |
912 else if (strcmp(lval, "do_ssl") == 0) | 917 gc->login_pass = g_strdup(rval); |
913 /* we ignore this. This option is used by sqilconf */ | 918 else if (strcmp(lval, "address") == 0) |
914 ; | 919 gc->address = create_address_qualified(rval, TRUE, conf.host_name); |
915 else if (strcmp(lval, "do_keep") == 0) | 920 else if (strcmp(lval, "return_path") == 0) |
916 gc->do_keep = parse_boolean(rval); | 921 gc->return_path = create_address_qualified(rval, TRUE, conf.host_name); |
917 else if (strcmp(lval, "do_uidl") == 0) | 922 else if (strcmp(lval, "do_ssl") == 0) |
918 gc->do_uidl = parse_boolean(rval); | 923 /* we ignore this. This option is used by sqilconf */ |
919 else if (strcmp(lval, "do_uidl_dele") == 0) | 924 ; |
920 gc->do_uidl_dele = parse_boolean(rval); | 925 else if (strcmp(lval, "do_keep") == 0) |
921 else if (strcmp(lval, "max_size") == 0) | 926 gc->do_keep = parse_boolean(rval); |
922 gc->max_size = atoi(rval); | 927 else if (strcmp(lval, "do_uidl") == 0) |
923 else if (strcmp(lval, "max_size_delete") == 0) | 928 gc->do_uidl = parse_boolean(rval); |
924 gc->max_size = parse_boolean(rval); | 929 else if (strcmp(lval, "do_uidl_dele") == 0) |
925 else if (strcmp(lval, "max_count") == 0) | 930 gc->do_uidl_dele = parse_boolean(rval); |
926 gc->max_count = atoi(rval); | 931 else if (strcmp(lval, "max_size") == 0) |
927 else if (strcmp(lval, "resolve_list") == 0) | 932 gc->max_size = atoi(rval); |
928 gc->resolve_list = parse_resolve_list(rval); | 933 else if (strcmp(lval, "max_size_delete") == 0) |
929 else | 934 gc->max_size = parse_boolean(rval); |
930 logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval); | 935 else if (strcmp(lval, "max_count") == 0) |
931 } | 936 gc->max_count = atoi(rval); |
932 fclose(in); | 937 else if (strcmp(lval, "resolve_list") == 0) |
933 | 938 gc->resolve_list = parse_resolve_list(rval); |
934 if (gc->resolve_list == NULL) { | 939 else |
940 logwrite(LOG_WARNING, "var '%s' not (yet) known, ignored\n", lval); | |
941 } | |
942 fclose(in); | |
943 | |
944 if (gc->resolve_list == NULL) { | |
935 #ifdef ENABLE_RESOLVER | 945 #ifdef ENABLE_RESOLVER |
936 gc->resolve_list = g_list_append(NULL, resolve_dns_a); | 946 gc->resolve_list = g_list_append(NULL, resolve_dns_a); |
937 #endif | 947 #endif |
938 gc->resolve_list = g_list_append(NULL, resolve_byname); | 948 gc->resolve_list = g_list_append(NULL, resolve_byname); |
939 } | 949 } |
940 | 950 |
941 if (gc->protocol == NULL) | 951 if (gc->protocol == NULL) |
942 gc->protocol = g_strdup("pop3"); | 952 gc->protocol = g_strdup("pop3"); |
943 return gc; | 953 return gc; |
944 } | |
945 logwrite(LOG_ALERT, "could not open get file %s: %s\n", filename, strerror(errno)); | |
946 | |
947 g_free(gc); | |
948 return NULL; | |
949 } | 954 } |
950 | 955 |
951 void | 956 void |
952 destroy_get_conf(get_conf * gc) | 957 destroy_get_conf(get_conf * gc) |
953 { | 958 { |
976 create_local_route() | 981 create_local_route() |
977 { | 982 { |
978 connect_route *route; | 983 connect_route *route; |
979 | 984 |
980 route = g_malloc(sizeof(connect_route)); | 985 route = g_malloc(sizeof(connect_route)); |
981 if (route) { | 986 if (!route) { |
982 memset(route, 0, sizeof(connect_route)); | 987 return NULL; |
983 route->protocol = g_strdup("smtp"); | 988 } |
984 route->is_local_net = TRUE; | 989 memset(route, 0, sizeof(connect_route)); |
985 route->name = g_strdup("local_net (default)"); | 990 route->protocol = g_strdup("smtp"); |
986 route->expand_h_sender_address = TRUE; | 991 route->is_local_net = TRUE; |
987 route->resolve_list = g_list_append(NULL, resolve_byname); | 992 route->name = g_strdup("local_net (default)"); |
988 route->connect_error_fail = TRUE; | 993 route->expand_h_sender_address = TRUE; |
989 } | 994 route->resolve_list = g_list_append(NULL, resolve_byname); |
995 route->connect_error_fail = TRUE; | |
990 return route; | 996 return route; |
991 } | 997 } |