$NetBSD: patch-ah,v 1.6 2005/11/04 03:47:49 grant Exp $ --- clamav-milter/clamav-milter.c.orig 2005-10-26 07:40:59.000000000 +1000 +++ clamav-milter/clamav-milter.c @@ -2973,7 +2973,7 @@ clamfi_eom(SMFICTX *ctx) * the postmaster, so include * some useful information */ - fprintf(sendmail, _("The message %1$s sent from %2$s to\n"), + fprintf(sendmail, _("The message %s sent from %s to\n"), sendmailId, privdata->from); else fprintf(sendmail, _("A message sent from %s to\n"), @@ -2987,7 +2987,7 @@ clamfi_eom(SMFICTX *ctx) fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename); if(hflag) { - fprintf(sendmail, _("\nThe message was received by %1$s from %2$s via %3$s\n\n"), + fprintf(sendmail, _("\nThe message was received by %s from %s via %s\n\n"), smfi_getsymval(ctx, "j"), privdata->from, smfi_getsymval(ctx, "_")); fputs(_("For your information, the original message headers were:\n\n"), sendmail); @@ -4150,7 +4150,7 @@ qfile(struct privdata *privdata, const c if(move(privdata->filename, newname) < 0) { if(use_syslog) - syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"), + syslog(LOG_WARNING, _("Can't rename %s to %s"), privdata->filename, newname); free(newname); return -1;