]>
Commit | Line | Data |
---|---|---|
f00c1e4c JB |
1 | --- postfix-2.2.2/src/global/mail_params.c.orig 2005-01-19 02:22:02.000000000 +0100 |
2 | +++ postfix-2.2.2/src/global/mail_params.c 2005-04-26 11:41:23.000000000 +0200 | |
bf21c84b | 3 | @@ -78,6 +78,7 @@ |
3ec179e4 AF |
4 | /* char *var_debug_peer_list; |
5 | /* int var_debug_peer_level; | |
35140025 | 6 | /* int var_in_flow_delay; |
447bfc58 GS |
7 | +/* char *var_reject_reply_msg_access_denied; |
8 | /* int var_fault_inj_code; | |
bf21c84b JK |
9 | /* char *var_bounce_service; |
10 | /* char *var_cleanup_service; | |
f00c1e4c | 11 | @@ -267,6 +268,7 @@ |
417d7d5e | 12 | char *var_export_environ; |
3ec179e4 AF |
13 | char *var_debug_peer_list; |
14 | int var_debug_peer_level; | |
417d7d5e | 15 | +char *var_reject_reply_msg_access_denied; |
447bfc58 | 16 | int var_fault_inj_code; |
bf21c84b JK |
17 | char *var_bounce_service; |
18 | char *var_cleanup_service; | |
f00c1e4c JB |
19 | @@ -510,6 +512,7 @@ |
20 | VAR_FLUSH_SERVICE, DEF_FLUSH_SERVICE, &var_flush_service, 1, 0, | |
21 | VAR_VERIFY_SERVICE, DEF_VERIFY_SERVICE, &var_verify_service, 1, 0, | |
22 | VAR_TRACE_SERVICE, DEF_TRACE_SERVICE, &var_trace_service, 1, 0, | |
23 | + VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0, | |
24 | #ifdef USE_TLS | |
25 | VAR_TLS_RAND_EXCH_NAME, DEF_TLS_RAND_EXCH_NAME, &var_tls_rand_exch_name, 0, 0, | |
26 | VAR_SMTPD_TLS_CERT_FILE, DEF_SMTPD_TLS_CERT_FILE, &var_smtpd_tls_cert_file, 0, 0, | |
bf21c84b JK |
27 | diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h |
28 | --- postfix-2.1.3.orig/src/global/mail_params.h 2004-06-22 14:32:58.615734426 +0200 | |
29 | +++ postfix-2.1.3/src/global/mail_params.h 2004-06-22 14:33:21.260418134 +0200 | |
30 | @@ -2204,6 +2204,13 @@ | |
31 | extern char *var_anvil_service; | |
32 | #endif | |
35140025 TO |
33 | |
34 | + /* | |
35 | + * SMTPD messages | |
36 | + */ | |
37 | +#define VAR_REJECT_REPLY_MSG_ACCESS_DENIED "smtpd_reject_msg_access_denied" | |
38 | +#define DEF_REJECT_REPLY_MSG_ACCESS_DENIED "rejected: Relay access denied." | |
39 | +extern char *var_reject_reply_msg_access_denied; | |
40 | + | |
41 | /* LICENSE | |
42 | /* .ad | |
43 | /* .fi | |
bf21c84b JK |
44 | diff -dur postfix-2.1.3.orig/src/smtpd/smtpd.c postfix-2.1.3/src/smtpd/smtpd.c |
45 | --- postfix-2.1.3.orig/src/smtpd/smtpd.c 2004-06-22 14:32:57.338808646 +0200 | |
46 | +++ postfix-2.1.3/src/smtpd/smtpd.c 2004-06-22 14:41:40.372360162 +0200 | |
47 | @@ -3089,6 +3089,7 @@ | |
48 | VAR_RELAY_CCERTS, DEF_RELAY_CCERTS, &var_relay_ccerts, 0, 0, | |
49 | VAR_SMTPD_SASL_TLS_OPTS, DEF_SMTPD_SASL_TLS_OPTS, &var_smtpd_sasl_tls_opts, 0, 0, | |
50 | #endif | |
51 | + VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0, | |
52 | 0, | |
53 | }; | |
54 | static CONFIG_RAW_TABLE raw_table[] = { | |
55 | diff -dur postfix-2.1.3.orig/src/smtpd/smtpd_check.c postfix-2.1.3/src/smtpd/smtpd_check.c | |
56 | --- postfix-2.1.3.orig/src/smtpd/smtpd_check.c 2004-06-22 14:32:57.348808065 +0200 | |
57 | +++ postfix-2.1.3/src/smtpd/smtpd_check.c 2004-06-22 14:33:21.271417494 +0200 | |
58 | @@ -1103,6 +1103,7 @@ | |
417d7d5e AF |
59 | char *reply_name, char *reply_class) |
60 | { | |
61 | char *myname = "check_relay_domains"; | |
62 | + VSTRING *reply_msg = vstring_alloc(1); | |
63 | ||
bf21c84b JK |
64 | #if 1 |
65 | static int once; | |
66 | @@ -1133,9 +1134,10 @@ | |
417d7d5e AF |
67 | /* |
68 | * Deny relaying between sites that both are not in relay_domains. | |
69 | */ | |
82e81937 TO |
70 | + vstring_strcat(reply_msg, "%d <%s>: %s "); |
71 | + vstring_strcat(reply_msg, var_reject_reply_msg_access_denied); | |
417d7d5e | 72 | return (smtpd_check_reject(state, MAIL_ERROR_POLICY, |
82e81937 | 73 | - "%d <%s>: %s rejected: Relay access denied", |
417d7d5e | 74 | - var_relay_code, reply_name, reply_class)); |
82e81937 | 75 | + vstring_export(reply_msg), var_relay_code, reply_name, reply_class)); |
417d7d5e AF |
76 | } |
77 | ||
78 | /* permit_auth_destination - OK for message relaying */ | |
bf21c84b | 79 | @@ -1192,6 +1194,7 @@ |
417d7d5e AF |
80 | static int reject_unauth_destination(SMTPD_STATE *state, char *recipient) |
81 | { | |
82 | char *myname = "reject_unauth_destination"; | |
83 | + VSTRING *reply_msg = vstring_alloc(1); | |
84 | ||
85 | if (msg_verbose) | |
86 | msg_info("%s: %s", myname, recipient); | |
bf21c84b | 87 | @@ -1205,9 +1208,10 @@ |
417d7d5e AF |
88 | /* |
89 | * Reject relaying to sites that are not listed in relay_domains. | |
90 | */ | |
91 | + vstring_strcat(reply_msg, "%d <%s>: "); | |
92 | + vstring_strcat(reply_msg, var_reject_reply_msg_access_denied); | |
93 | return (smtpd_check_reject(state, MAIL_ERROR_POLICY, | |
94 | - "%d <%s>: Relay access denied", | |
95 | - var_relay_code, recipient)); | |
96 | + vstring_export(reply_msg), var_relay_code, recipient)); | |
97 | } | |
98 | ||
99 | /* reject_unauth_pipelining - reject improper use of SMTP command pipelining */ |