static void
never_error(uschar *log_msg, uschar *smtp_msg, int was_errno)
{
-uschar *emsg = (was_errno <= 0)? US"" :
- string_sprintf(": %s", strerror(was_errno));
+uschar *emsg = was_errno <= 0
+ ? US"" : string_sprintf(": %s", strerror(was_errno));
log_write(0, LOG_MAIN|LOG_PANIC, "%s%s", log_msg, emsg);
-if (smtp_out != NULL) smtp_printf("421 %s\r\n", FALSE, smtp_msg);
+if (smtp_out) smtp_printf("421 %s\r\n", FALSE, smtp_msg);
}
whofrom = string_append(NULL, 3, "[", sender_host_address, "]");
if (LOGGING(incoming_port))
- whofrom = string_append(whofrom, 2, ":", string_sprintf("%d", sender_host_port));
+ whofrom = string_fmt_append(whofrom, ":%d", sender_host_port);
if (LOGGING(incoming_interface))
- whofrom = string_append(whofrom, 4, " I=[",
- interface_address, "]:", string_sprintf("%d", interface_port));
+ whofrom = string_fmt_append(whofrom, " I=[%s]:%d",
+ interface_address, interface_port);
(void) string_from_gstring(whofrom); /* Terminate the newly-built string */
int i, j;
int smtp_ports = 0;
int smtps_ports = 0;
- ip_address_item * ipa, * i2;
- uschar * p = big_buffer;
+ ip_address_item * ipa;
+ uschar * p;
uschar * qinfo = queue_interval > 0
? string_sprintf("-q%s", readconf_printtime(queue_interval))
: US"no queue runs";
deprecated protocol that starts TLS without using STARTTLS), and others
listening for standard SMTP. Keep their listings separate. */
- for (j = 0; j < 2; j++)
+ for (int j = 0, i; j < 2; j++)
{
for (i = 0, ipa = addresses; i < 10 && ipa; i++, ipa = ipa->next)
{
/* First time round, look for SMTP ports; second time round, look for
- SMTPS ports. For the first one of each, insert leading text. */
+ SMTPS ports. Build IP+port strings. */
if (host_is_tls_on_connect_port(ipa->port) == (j > 0))
{
if (j == 0)
- {
- if (smtp_ports++ == 0)
- {
- memcpy(p, "SMTP on", 8);
- p += 7;
- }
- }
+ smtp_ports++;
else
- if (smtps_ports++ == 0)
- p += sprintf(CS p, "%sSMTPS on",
- smtp_ports == 0 ? "" : " and for ");
+ smtps_ports++;
/* Now the information about the port (and sometimes interface) */
if (ipa->next && ipa->next->address[0] == 0 &&
ipa->next->port == ipa->port)
{
- p += sprintf(CS p, " port %d (IPv6 and IPv4)", ipa->port);
- ipa = ipa->next;
+ ipa->log = string_sprintf(" port %d (IPv6 and IPv4)", ipa->port);
+ (ipa = ipa->next)->log = NULL;
}
else if (ipa->v6_include_v4)
- p += sprintf(CS p, " port %d (IPv6 with IPv4)", ipa->port);
+ ipa->log = string_sprintf(" port %d (IPv6 with IPv4)", ipa->port);
else
- p += sprintf(CS p, " port %d (IPv6)", ipa->port);
+ ipa->log = string_sprintf(" port %d (IPv6)", ipa->port);
}
else if (ipa->address[0] == 0) /* v4 wildcard */
- p += sprintf(CS p, " port %d (IPv4)", ipa->port);
+ ipa->log = string_sprintf(" port %d (IPv4)", ipa->port);
else /* check for previously-seen IP */
{
+ ip_address_item * i2;
for (i2 = addresses; i2 != ipa; i2 = i2->next)
if ( host_is_tls_on_connect_port(i2->port) == (j > 0)
&& Ustrcmp(ipa->address, i2->address) == 0
)
{ /* found; append port to list */
- if (p[-1] == '}') p--;
- while (isdigit(*--p)) ;
- p += 1 + sprintf(CS p+1, "%s%d,%d}", *p == ',' ? "" : "{",
- i2->port, ipa->port);
+ for (p = i2->log; *p; ) p++; /* end of existing string */
+ if (*--p == '}') *p = '\0'; /* drop EOL */
+ while (isdigit(*--p)) ; /* char before port */
+
+ i2->log = *p == ':' /* no list yet? */
+ ? string_sprintf("%.*s{%s,%d}",
+ (int)(p - i2->log + 1), i2->log, p+1, ipa->port)
+ : string_sprintf("%s,%d}", i2->log, ipa->port);
+ ipa->log = NULL;
break;
}
if (i2 == ipa) /* first-time IP */
- p += sprintf(CS p, " [%s]:%d", ipa->address, ipa->port);
+ ipa->log = string_sprintf(" [%s]:%d", ipa->address, ipa->port);
}
}
}
+ }
- if (ipa)
+ p = big_buffer;
+ for (int j = 0, i; j < 2; j++)
+ {
+ /* First time round, look for SMTP ports; second time round, look for
+ SMTPS ports. For the first one of each, insert leading text. */
+
+ if (j == 0)
{
- memcpy(p, " ...", 5);
- p += 4;
+ if (smtp_ports > 0)
+ p += sprintf(CS p, "SMTP on");
}
+ else
+ if (smtps_ports > 0)
+ p += sprintf(CS p, "%sSMTPS on",
+ smtp_ports == 0 ? "" : " and for ");
+
+ /* Now the information about the port (and sometimes interface) */
+
+ for (i = 0, ipa = addresses; i < 10 && ipa; i++, ipa = ipa->next)
+ if (host_is_tls_on_connect_port(ipa->port) == (j > 0))
+ if (ipa->log)
+ p += sprintf(CS p, "%s", ipa->log);
+
+ if (ipa)
+ p += sprintf(CS p, " ...");
}
log_write(0, LOG_MAIN,