|| sd->retry <= 0
)
break;
- DEBUG(D_acl) debug_printf("sspamd: erver %s: retry conn\n", sd->hostspec);
+ DEBUG(D_acl) debug_printf("spamd: server %s: retry conn\n", sd->hostspec);
while (sd->retry > 0) sd->retry = sleep(sd->retry);
}
if (spamd_sock >= 0)
if ((authid = expand_string(US"$authenticated_id")) != NULL && *authid != '\0')
req_str = string_sprintf("%sUser: %s\r\n", req_str, authid);
req_str = string_sprintf("%s\r\n", req_str);
- wrote = send(spamd_sock, req_str, Ustrlen(req_str), 0);
+ wrote = send(spamd_sock, req_str, Ustrlen(req_str), 0);
}
else
{ /* spamassassin variant */
{
(void)close(spamd_sock);
log_write(0, LOG_MAIN|LOG_PANIC,
- "%s spamd send failed: %s", loglabel, strerror(errno));
+ "%s spamd %s send failed: %s", loglabel, callout_address, strerror(errno));
goto defer;
}
{
if (result == -1)
log_write(0, LOG_MAIN|LOG_PANIC,
- "%s %s on spamd socket", loglabel, strerror(errno));
+ "%s %s on spamd %s socket", loglabel, callout_address, strerror(errno));
else
{
if (time(NULL) - start < sd->timeout)
goto again;
log_write(0, LOG_MAIN|LOG_PANIC,
- "%s timed out writing spamd socket", loglabel);
+ "%s timed out writing spamd %s, socket", loglabel, callout_address);
}
(void)close(spamd_sock);
goto defer;
if (wrote == -1)
{
log_write(0, LOG_MAIN|LOG_PANIC,
- "%s %s on spamd socket", loglabel, strerror(errno));
+ "%s %s on spamd %s socket", loglabel, callout_address, strerror(errno));
(void)close(spamd_sock);
goto defer;
}
if (i <= 0 && errno != 0)
{
log_write(0, LOG_MAIN|LOG_PANIC,
- "%s error reading from spamd socket: %s", loglabel, strerror(errno));
+ "%s error reading from spamd %s, socket: %s", loglabel, callout_address, strerror(errno));
(void)close(spamd_sock);
return DEFER;
}
&spamd_reject_score, &spamd_report_offset)) != 5)
{
log_write(0, LOG_MAIN|LOG_PANIC,
- "%s cannot parse spamd output: %d", loglabel, r);
+ "%s cannot parse spamd %s, output: %d", loglabel, callout_address, r);
return DEFER;
}
/* now parse action */
spamd_version,&spamd_score,&spamd_threshold,&spamd_report_offset) != 3)
{
log_write(0, LOG_MAIN|LOG_PANIC,
- "%s cannot parse spamd output", loglabel);
+ "%s cannot parse spamd %s output", loglabel, callout_address);
return DEFER;
}
}