Mercurial > masqmail

comparison src/conf.c @ 178:91f8ee6514f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed `remote_port' config option it was already deprecated for some time see NEWS at release 0.2.12 for details
author meillo@marmaro.de
date Wed, 14 Jul 2010 16:48:45 +0200
parents 5b621742b2e7
children 6b4a101a2455
comparison
equal deleted inserted replaced
177:6530806d418f 178:91f8ee6514f5
425 read_conf(gchar * filename) 425 read_conf(gchar * filename)
426 { 426 {
427 FILE *in; 427 FILE *in;
428 428
429 conf.log_max_pri = 7; 429 conf.log_max_pri = 7;
430 conf.remote_port = 25;
431 conf.do_relay = TRUE; 430 conf.do_relay = TRUE;
432 conf.alias_local_cmp = strcmp; 431 conf.alias_local_cmp = strcmp;
433 conf.max_defer_time = 86400 * 4; /* 4 days */ 432 conf.max_defer_time = 86400 * 4; /* 4 days */
434 conf.max_msg_size = 0; /* no limit on msg size */ 433 conf.max_msg_size = 0; /* no limit on msg size */
435 conf.spool_dir = SPOOL_DIR; 434 conf.spool_dir = SPOOL_DIR;
472 fgets(buf, 255, fptr); 471 fgets(buf, 255, fptr);
473 g_strchomp(buf); 472 g_strchomp(buf);
474 conf.host_name = g_strdup(buf); 473 conf.host_name = g_strdup(buf);
475 fclose(fptr); 474 fclose(fptr);
476 } 475 }
477 } else if (strcmp(lval, "remote_port") == 0) {
478 logwrite(LOG_WARNING, "the remote_port option is now deprecated. Use 'mail_host' in the\n"
479 "route configuration instead. See man masqmail.route\n");
480 conf.remote_port = atoi(rval);
481 } else if (strcmp(lval, "local_hosts") == 0) 476 } else if (strcmp(lval, "local_hosts") == 0)
482 conf.local_hosts = parse_list(rval, FALSE); 477 conf.local_hosts = parse_list(rval, FALSE);
483 else if (strcmp(lval, "local_addresses") == 0) 478 else if (strcmp(lval, "local_addresses") == 0)
484 conf.local_addresses = parse_list(rval, TRUE); 479 conf.local_addresses = parse_list(rval, TRUE);
485 else if (strcmp(lval, "not_local_addresses") == 0) 480 else if (strcmp(lval, "not_local_addresses") == 0)
659 gchar lval[256], rval[2048]; 654 gchar lval[256], rval[2048];
660 while (read_statement(in, lval, 256, rval, 2048)) { 655 while (read_statement(in, lval, 256, rval, 2048)) {
661 if (strcmp(lval, "protocol") == 0) 656 if (strcmp(lval, "protocol") == 0)
662 route->protocol = g_strdup(rval); 657 route->protocol = g_strdup(rval);
663 else if (strcmp(lval, "mail_host") == 0) 658 else if (strcmp(lval, "mail_host") == 0)
664 route->mail_host = parse_interface(rval, conf.remote_port); 659 route->mail_host = parse_interface(rval, 25);
665 else if (strcmp(lval, "helo_name") == 0) 660 else if (strcmp(lval, "helo_name") == 0)
666 route->helo_name = g_strdup(rval); 661 route->helo_name = g_strdup(rval);
667 else if (strcmp(lval, "wrapper") == 0) 662 else if (strcmp(lval, "wrapper") == 0)
668 route->wrapper = g_strdup(rval); 663 route->wrapper = g_strdup(rval);
669 else if (strcmp(lval, "connect_error_fail") == 0) 664 else if (strcmp(lval, "connect_error_fail") == 0)