1.1 --- a/examples/masqmail.conf	Wed Jul 14 16:35:17 2010 +0200
     1.2 +++ b/examples/masqmail.conf	Wed Jul 14 16:48:45 2010 +0200
     1.3 @@ -34,10 +34,6 @@
     1.4  # CHANGING THIS IS REQUIRED!
     1.5  listen_addresses="localhost:25"
     1.6  
     1.7 -# send messages to this port:
     1.8 -# probably this will also be configurable on host basis in future versions.
     1.9 -remote_port=25
    1.10 -
    1.11  # where masqmail stores its spool files and other stuff:
    1.12  spool_dir="/var/spool/masqmail"
    1.13  

     2.1 --- a/man/masqmail.conf.5	Wed Jul 14 16:35:17 2010 +0200
     2.2 +++ b/man/masqmail.conf.5	Wed Jul 14 16:48:45 2010 +0200
     2.3 @@ -113,15 +113,6 @@
     2.4  Default: none; \fBhost_name\fP MUST be set in the config file
     2.5  
     2.6  .TP
     2.7 -\fBremote_port = \fIn\fR
     2.8 -
     2.9 -The remote port number to be used. This defaults to port 25.
    2.10 -
    2.11 -This option is deprecated.
    2.12 -Use \fBhost_name\fR in the route configuration instead.
    2.13 -See \fBmasqmail.route(5)\fR.
    2.14 -
    2.15 -.TP
    2.16  \fBlocal_hosts = \fIlist\fR
    2.17  
    2.18  A semicolon `;' separated list of hostnames which are considered local.

     3.1 --- a/src/conf.c	Wed Jul 14 16:35:17 2010 +0200
     3.2 +++ b/src/conf.c	Wed Jul 14 16:48:45 2010 +0200
     3.3 @@ -427,7 +427,6 @@
     3.4  	FILE *in;
     3.5  
     3.6  	conf.log_max_pri = 7;
     3.7 -	conf.remote_port = 25;
     3.8  	conf.do_relay = TRUE;
     3.9  	conf.alias_local_cmp = strcmp;
    3.10  	conf.max_defer_time = 86400 * 4;  /* 4 days */
    3.11 @@ -474,10 +473,6 @@
    3.12  				conf.host_name = g_strdup(buf);
    3.13  				fclose(fptr);
    3.14  			}
    3.15 -		} else if (strcmp(lval, "remote_port") == 0) {
    3.16 -			logwrite(LOG_WARNING, "the remote_port option is now deprecated. Use 'mail_host' in the\n"
    3.17 -							"route configuration instead. See man masqmail.route\n");
    3.18 -			conf.remote_port = atoi(rval);
    3.19  		} else if (strcmp(lval, "local_hosts") == 0)
    3.20  			conf.local_hosts = parse_list(rval, FALSE);
    3.21  		else if (strcmp(lval, "local_addresses") == 0)
    3.22 @@ -661,7 +656,7 @@
    3.23  		if (strcmp(lval, "protocol") == 0)
    3.24  			route->protocol = g_strdup(rval);
    3.25  		else if (strcmp(lval, "mail_host") == 0)
    3.26 -			route->mail_host = parse_interface(rval, conf.remote_port);
    3.27 +			route->mail_host = parse_interface(rval, 25);
    3.28  		else if (strcmp(lval, "helo_name") == 0)
    3.29  			route->helo_name = g_strdup(rval);
    3.30  		else if (strcmp(lval, "wrapper") == 0)

     4.1 --- a/src/deliver.c	Wed Jul 14 16:35:17 2010 +0200
     4.2 +++ b/src/deliver.c	Wed Jul 14 16:48:45 2010 +0200
     4.3 @@ -321,7 +321,7 @@
     4.4  	gboolean ok = FALSE;
     4.5  	GList *msgout_node;
     4.6  	smtp_base *psb;
     4.7 -	gint port;
     4.8 +	gint port = 25;
     4.9  
    4.10  	/* paranoid check: */
    4.11  	if (msgout_list == NULL) {
    4.12 @@ -332,8 +332,7 @@
    4.13  	if (host == NULL) {
    4.14  		host = route->mail_host->address;
    4.15  		port = route->mail_host->port;
    4.16 -	} else
    4.17 -		port = conf.remote_port;
    4.18 +	}
    4.19  
    4.20  #ifdef ENABLE_POP3
    4.21  	if (route->pop3_login) {

     5.1 --- a/src/masqmail.h	Wed Jul 14 16:35:17 2010 +0200
     5.2 +++ b/src/masqmail.h	Wed Jul 14 16:48:45 2010 +0200
     5.3 @@ -172,8 +172,6 @@
     5.4  	GList *local_nets;
     5.5  	GList *listen_addresses;
     5.6  
     5.7 -	guint remote_port;
     5.8 -
     5.9  	/* ANSI C defines unsigned long to be at least 32bit
    5.10  	   i.e. ca. 4GB max; that should be enough. */
    5.11  	gulong max_msg_size;