masqmail
diff src/conf.c @ 178:91f8ee6514f5
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 |
line diff
1.1 --- a/src/conf.c Wed Jul 14 16:35:17 2010 +0200 1.2 +++ b/src/conf.c Wed Jul 14 16:48:45 2010 +0200 1.3 @@ -427,7 +427,6 @@ 1.4 FILE *in; 1.5 1.6 conf.log_max_pri = 7; 1.7 - conf.remote_port = 25; 1.8 conf.do_relay = TRUE; 1.9 conf.alias_local_cmp = strcmp; 1.10 conf.max_defer_time = 86400 * 4; /* 4 days */ 1.11 @@ -474,10 +473,6 @@ 1.12 conf.host_name = g_strdup(buf); 1.13 fclose(fptr); 1.14 } 1.15 - } else if (strcmp(lval, "remote_port") == 0) { 1.16 - logwrite(LOG_WARNING, "the remote_port option is now deprecated. Use 'mail_host' in the\n" 1.17 - "route configuration instead. See man masqmail.route\n"); 1.18 - conf.remote_port = atoi(rval); 1.19 } else if (strcmp(lval, "local_hosts") == 0) 1.20 conf.local_hosts = parse_list(rval, FALSE); 1.21 else if (strcmp(lval, "local_addresses") == 0) 1.22 @@ -661,7 +656,7 @@ 1.23 if (strcmp(lval, "protocol") == 0) 1.24 route->protocol = g_strdup(rval); 1.25 else if (strcmp(lval, "mail_host") == 0) 1.26 - route->mail_host = parse_interface(rval, conf.remote_port); 1.27 + route->mail_host = parse_interface(rval, 25); 1.28 else if (strcmp(lval, "helo_name") == 0) 1.29 route->helo_name = g_strdup(rval); 1.30 else if (strcmp(lval, "wrapper") == 0)