Mercurial > masqmail
changeset 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 | 6530806d418f |
| children | 3190e6864452 |
| files | examples/masqmail.conf man/masqmail.conf.5 src/conf.c src/deliver.c src/masqmail.h |
| diffstat | 5 files changed, 3 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/masqmail.conf Wed Jul 14 16:35:17 2010 +0200 +++ b/examples/masqmail.conf Wed Jul 14 16:48:45 2010 +0200 @@ -34,10 +34,6 @@ # CHANGING THIS IS REQUIRED! listen_addresses="localhost:25" -# send messages to this port: -# probably this will also be configurable on host basis in future versions. -remote_port=25 - # where masqmail stores its spool files and other stuff: spool_dir="/var/spool/masqmail"
--- a/man/masqmail.conf.5 Wed Jul 14 16:35:17 2010 +0200 +++ b/man/masqmail.conf.5 Wed Jul 14 16:48:45 2010 +0200 @@ -113,15 +113,6 @@ Default: none; \fBhost_name\fP MUST be set in the config file .TP -\fBremote_port = \fIn\fR - -The remote port number to be used. This defaults to port 25. - -This option is deprecated. -Use \fBhost_name\fR in the route configuration instead. -See \fBmasqmail.route(5)\fR. - -.TP \fBlocal_hosts = \fIlist\fR A semicolon `;' separated list of hostnames which are considered local.
--- 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)
--- a/src/deliver.c Wed Jul 14 16:35:17 2010 +0200 +++ b/src/deliver.c Wed Jul 14 16:48:45 2010 +0200 @@ -321,7 +321,7 @@ gboolean ok = FALSE; GList *msgout_node; smtp_base *psb; - gint port; + gint port = 25; /* paranoid check: */ if (msgout_list == NULL) { @@ -332,8 +332,7 @@ if (host == NULL) { host = route->mail_host->address; port = route->mail_host->port; - } else - port = conf.remote_port; + } #ifdef ENABLE_POP3 if (route->pop3_login) {
--- a/src/masqmail.h Wed Jul 14 16:35:17 2010 +0200 +++ b/src/masqmail.h Wed Jul 14 16:48:45 2010 +0200 @@ -172,8 +172,6 @@ GList *local_nets; GList *listen_addresses; - guint remote_port; - /* ANSI C defines unsigned long to be at least 32bit i.e. ca. 4GB max; that should be enough. */ gulong max_msg_size;