You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

109 lines
3.4 KiB

  1. Index: sendmail-8.15.2/sendmail/envelope.c
  2. ===================================================================
  3. --- sendmail-8.15.2.orig/sendmail/envelope.c
  4. +++ sendmail-8.15.2/sendmail/envelope.c
  5. @@ -323,7 +323,7 @@ dropenvelope(e, fulldrop, split)
  6. /* don't free, allocated from e_rpool */
  7. e->e_message = sm_rpool_strdup_x(e->e_rpool, buf);
  8. - message(buf);
  9. + message("%s", buf);
  10. e->e_flags |= EF_CLRQUEUE;
  11. }
  12. if (msg_timeout == MSG_NOT_BY)
  13. @@ -420,7 +420,7 @@ dropenvelope(e, fulldrop, split)
  14. /* don't free, allocated from e_rpool */
  15. e->e_message = sm_rpool_strdup_x(e->e_rpool,
  16. buf);
  17. - message(buf);
  18. + message("%s", buf);
  19. e->e_flags |= EF_WARNING;
  20. }
  21. if (msg_timeout == MSG_WARN_BY)
  22. Index: sendmail-8.15.2/sendmail/parseaddr.c
  23. ===================================================================
  24. --- sendmail-8.15.2.orig/sendmail/parseaddr.c
  25. +++ sendmail-8.15.2/sendmail/parseaddr.c
  26. @@ -218,7 +218,7 @@ parseaddr(addr, a, flags, delim, delimpt
  27. msg = "Deferring message until queue run";
  28. if (tTd(20, 1))
  29. sm_dprintf("parseaddr: queueing message\n");
  30. - message(msg);
  31. + message("%s", msg);
  32. if (e->e_message == NULL && e->e_sendmode != SM_DEFER)
  33. e->e_message = sm_rpool_strdup_x(e->e_rpool, msg);
  34. a->q_state = QS_QUEUEUP;
  35. Index: sendmail-8.15.2/sendmail/srvrsmtp.c
  36. ===================================================================
  37. --- sendmail-8.15.2.orig/sendmail/srvrsmtp.c
  38. +++ sendmail-8.15.2/sendmail/srvrsmtp.c
  39. @@ -578,13 +578,13 @@ static bool smtp_data __P((SMTP_T *, ENV
  40. bool tsave = QuickAbort; \
  41. \
  42. QuickAbort = false; \
  43. - usrerr(response); \
  44. + usrerr("%s", response); \
  45. QuickAbort = tsave; \
  46. e->e_sendqueue = NULL; \
  47. goto doquit; \
  48. } \
  49. else \
  50. - usrerr(response); \
  51. + usrerr("%s", response); \
  52. break; \
  53. \
  54. case SMFIR_REJECT: \
  55. @@ -615,7 +615,7 @@ static bool smtp_data __P((SMTP_T *, ENV
  56. str, addr, MSG_TEMPFAIL); \
  57. LogUsrErrs = false; \
  58. } \
  59. - usrerr(MSG_TEMPFAIL); \
  60. + usrerr("%s", MSG_TEMPFAIL); \
  61. break; \
  62. default: \
  63. milter_cmd_fail = false; \
  64. @@ -931,7 +931,7 @@ smtp(nullserver, d_flags, e)
  65. }
  66. else if (strncmp(nullserver, "421 ", 4) == 0)
  67. {
  68. - message(nullserver);
  69. + message("%s", nullserver);
  70. goto doquit;
  71. }
  72. @@ -1849,7 +1849,7 @@ smtp(nullserver, d_flags, e)
  73. if (nullserver != NULL)
  74. {
  75. if (ISSMTPREPLY(nullserver))
  76. - usrerr(nullserver);
  77. + usrerr("%s", nullserver);
  78. else
  79. usrerr("550 5.0.0 %s",
  80. nullserver);
  81. @@ -2452,7 +2452,7 @@ smtp(nullserver, d_flags, e)
  82. tempfail = true;
  83. smtp.sm_milterize = false;
  84. if (response != NULL)
  85. - usrerr(response);
  86. + usrerr("%s", response);
  87. else
  88. message("421 4.7.0 %s closing connection",
  89. MyHostName);
  90. @@ -3659,7 +3659,7 @@ smtp_data(smtp, e)
  91. (void) extenhsc(response + 4, ' ', e->e_enhsc);
  92. #endif /* _FFR_MILTER_ENHSC */
  93. - usrerr(response);
  94. + usrerr("%s", response);
  95. if (strncmp(response, "421 ", 4) == 0
  96. || strncmp(response, "421-", 4) == 0)
  97. {
  98. @@ -3779,7 +3779,7 @@ smtp_data(smtp, e)
  99. if (ISSMTPCODE(response))
  100. (void) extenhsc(response + 4, ' ', e->e_enhsc);
  101. #endif /* _FFR_MILTER_ENHSC */
  102. - usrerr(response);
  103. + usrerr("%s", response);
  104. if (strncmp(response, "421 ", 4) == 0
  105. || strncmp(response, "421-", 4) == 0)
  106. rv = false;