Mercurial > masqmail

diff 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
line wrap: on
line diff
--- a/src/conf.c	Wed Jul 14 16:35:17 2010 +0200
+++ b/src/conf.c	Wed Jul 14 16:48:45 2010 +0200
@@ -427,7 +427,6 @@
 	FILE *in;
 
 	conf.log_max_pri = 7;
-	conf.remote_port = 25;
 	conf.do_relay = TRUE;
 	conf.alias_local_cmp = strcmp;
 	conf.max_defer_time = 86400 * 4;  /* 4 days */
@@ -474,10 +473,6 @@
 				conf.host_name = g_strdup(buf);
 				fclose(fptr);
 			}
-		} else if (strcmp(lval, "remote_port") == 0) {
-			logwrite(LOG_WARNING, "the remote_port option is now deprecated. Use 'mail_host' in the\n"
-							"route configuration instead. See man masqmail.route\n");
-			conf.remote_port = atoi(rval);
 		} else if (strcmp(lval, "local_hosts") == 0)
 			conf.local_hosts = parse_list(rval, FALSE);
 		else if (strcmp(lval, "local_addresses") == 0)
@@ -661,7 +656,7 @@
 		if (strcmp(lval, "protocol") == 0)
 			route->protocol = g_strdup(rval);
 		else if (strcmp(lval, "mail_host") == 0)
-			route->mail_host = parse_interface(rval, conf.remote_port);
+			route->mail_host = parse_interface(rval, 25);
 		else if (strcmp(lval, "helo_name") == 0)
 			route->helo_name = g_strdup(rval);
 		else if (strcmp(lval, "wrapper") == 0)