1 diff -urN snapshot-20011114/src/global/mail_params.c snapshot-20011114.my/src/global/mail_params.c
2 --- snapshot-20011114/src/global/mail_params.c Thu Nov 15 11:15:54 2001
3 +++ snapshot-20011114.my/src/global/mail_params.c Thu Nov 15 11:19:19 2001
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;
10 /* void mail_params_init()
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;
18 /* check_myhostname - lookup hostname and validate */
21 VAR_SMTP_TLS_CLIST, DEF_SMTP_TLS_CLIST, &var_smtp_tls_cipherlist, 0, 0,
22 VAR_SMTP_TLS_SCACHE_DB, DEF_SMTP_TLS_SCACHE_DB, &var_smtp_tls_scache_db, 0, 0,
23 VAR_TLS_DAEMON_RAND_SOURCE, DEF_TLS_DAEMON_RAND_SOURCE, &var_tls_daemon_rand_source, 0, 0,
24 + VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
27 static CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
28 diff -urN snapshot-20011114/src/global/mail_params.h snapshot-20011114.my/src/global/mail_params.h
29 --- snapshot-20011114/src/global/mail_params.h Thu Nov 15 11:15:54 2001
30 +++ snapshot-20011114.my/src/global/mail_params.h Thu Nov 15 11:16:27 2001
31 @@ -1505,6 +1505,13 @@
32 #define DEF_IN_FLOW_DELAY "1s"
33 extern int var_in_flow_delay;
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;
45 diff -urN snapshot-20011114/src/smtpd/smtpd.c snapshot-20011114.my/src/smtpd/smtpd.c
46 --- snapshot-20011114/src/smtpd/smtpd.c Thu Nov 15 11:15:54 2001
47 +++ snapshot-20011114.my/src/smtpd/smtpd.c Thu Nov 15 11:16:27 2001
49 VAR_FILTER_XPORT, DEF_FILTER_XPORT, &var_filter_xport, 0, 0,
50 VAR_PERM_MX_NETWORKS, DEF_PERM_MX_NETWORKS, &var_perm_mx_networks, 0, 0,
51 VAR_RELAY_CCERTS, DEF_RELAY_CCERTS, &var_relay_ccerts, 0, 0,
52 + VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
56 diff -urN snapshot-20011114/src/smtpd/smtpd_check.c snapshot-20011114.my/src/smtpd/smtpd_check.c
57 --- snapshot-20011114/src/smtpd/smtpd_check.c Thu Nov 15 11:15:54 2001
58 +++ snapshot-20011114.my/src/smtpd/smtpd_check.c Thu Nov 15 11:16:27 2001
60 char *reply_name, char *reply_class)
62 char *myname = "check_relay_domains";
63 + VSTRING *reply_msg = vstring_alloc(1);
66 msg_info("%s: %s", myname, recipient);
69 * Deny relaying between sites that both are not in relay_domains.
71 + vstring_strcat(reply_msg, "%d <%s>: %s ");
72 + vstring_strcat(reply_msg, var_reject_reply_msg_access_denied);
73 return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
74 - "%d <%s>: %s odrzucony/rejected: Relay access denied",
75 - var_relay_code, reply_name, reply_class));
76 + vstring_export(reply_msg), var_relay_code, reply_name, reply_class));
79 /* permit_auth_destination - OK for message relaying */
81 static int reject_unauth_destination(SMTPD_STATE *state, char *recipient)
83 char *myname = "reject_unauth_destination";
84 + VSTRING *reply_msg = vstring_alloc(1);
87 msg_info("%s: %s", myname, recipient);
88 @@ -1036,9 +1039,10 @@
90 * Reject relaying to sites that are not listed in relay_domains.
92 + vstring_strcat(reply_msg, "%d <%s>: ");
93 + vstring_strcat(reply_msg, var_reject_reply_msg_access_denied);
94 return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
95 - "%d <%s>: Relay access denied",
96 - var_relay_code, recipient));
97 + vstring_export(reply_msg), var_relay_code, recipient));
100 /* reject_unauth_pipelining - reject improper use of SMTP command pipelining */