]> TLD Linux GIT Repositories - packages/postfix.git/blob - postfix-conf_msg.patch
- updated to 3.8.1, dropped duplicate trigger, rediffed patch 1
[packages/postfix.git] / postfix-conf_msg.patch
1 diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.c postfix-3.8.1/src/global/mail_params.c
2 --- postfix-3.8.1.org/src/global/mail_params.c  2021-10-22 20:47:31.000000000 +0200
3 +++ postfix-3.8.1/src/global/mail_params.c      2023-07-09 22:19:21.172026512 +0200
4 @@ -83,6 +83,7 @@
5  /*     char    *var_debug_peer_list;
6  /*     int     var_debug_peer_level;
7  /*     int     var_in_flow_delay;
8 +/*     char    *var_reject_reply_msg_access_denied;
9  /*     int     var_fault_inj_code;
10  /*     char   *var_bounce_service;
11  /*     char   *var_cleanup_service;
12 @@ -319,6 +320,7 @@ char   *var_import_environ;
13  char   *var_export_environ;
14  char   *var_debug_peer_list;
15  int     var_debug_peer_level;
16 +char   *var_reject_reply_msg_access_denied;
17  int     var_fault_inj_code;
18  char   *var_bounce_service;
19  char   *var_cleanup_service;
20 @@ -806,6 +808,7 @@ void    mail_params_init()
21         VAR_SMTPUTF8_AUTOCLASS, DEF_SMTPUTF8_AUTOCLASS, &var_smtputf8_autoclass, 1, 0,
22         VAR_DROP_HDRS, DEF_DROP_HDRS, &var_drop_hdrs, 0, 0,
23         VAR_INFO_LOG_ADDR_FORM, DEF_INFO_LOG_ADDR_FORM, &var_info_log_addr_form, 1, 0,
24 +       VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
25         0,
26      };
27      static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
28 diff -urNp -x '*.orig' postfix-3.8.1.org/src/global/mail_params.h postfix-3.8.1/src/global/mail_params.h
29 --- postfix-3.8.1.org/src/global/mail_params.h  2023-07-09 22:19:21.003024104 +0200
30 +++ postfix-3.8.1/src/global/mail_params.h      2023-07-09 22:19:21.172026512 +0200
31 @@ -4411,6 +4411,13 @@ extern bool var_ign_srv_lookup_err;
32  #define DEF_ALLOW_SRV_FALLBACK 0
33  extern bool var_allow_srv_fallback;
34  
35 + /*
36 +  * SMTPD messages
37 +  */
38 +#define VAR_REJECT_REPLY_MSG_ACCESS_DENIED     "smtpd_reject_msg_access_denied"
39 +#define DEF_REJECT_REPLY_MSG_ACCESS_DENIED     "rejected: Relay access denied."
40 +extern char *var_reject_reply_msg_access_denied;
41 +
42  /* LICENSE
43  /* .ad
44  /* .fi
45 diff -urNp -x '*.orig' postfix-3.8.1.org/src/smtpd/smtpd.c postfix-3.8.1/src/smtpd/smtpd.c
46 --- postfix-3.8.1.org/src/smtpd/smtpd.c 2023-06-05 21:06:51.000000000 +0200
47 +++ postfix-3.8.1/src/smtpd/smtpd.c     2023-07-09 22:19:21.173026526 +0200
48 @@ -6645,6 +6645,7 @@ int     main(int argc, char **argv)
49         VAR_MILT_MACRO_DEFLTS, DEF_MILT_MACRO_DEFLTS, &var_milt_macro_deflts, 0, 0,
50         VAR_SMTPD_MILTER_MAPS, DEF_SMTPD_MILTER_MAPS, &var_smtpd_milter_maps, 0, 0,
51         VAR_STRESS, DEF_STRESS, &var_stress, 0, 0,
52 +       VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
53         VAR_UNV_FROM_WHY, DEF_UNV_FROM_WHY, &var_unv_from_why, 0, 0,
54         VAR_UNV_RCPT_WHY, DEF_UNV_RCPT_WHY, &var_unv_rcpt_why, 0, 0,
55         VAR_REJECT_TMPF_ACT, DEF_REJECT_TMPF_ACT, &var_reject_tmpf_act, 1, 0,