projects / packages / postfix.git / blame
| Commit | Line | Data |
|---|---|---|
| 82e81937 TO |
1 | diff -ruN postfix-1.1.11/src/global/mail_params.c postfix-1.1.11.my/src/global/mail_params.c |
| 2 | --- postfix-1.1.11/src/global/mail_params.c Wed Sep 18 12:16:53 2002 | |
| 3 | +++ postfix-1.1.11.my/src/global/mail_params.c Wed Sep 18 12:08:12 2002 | |
| 4 | @@ -75,6 +75,7 @@ | |
| 3ec179e4 AF |
5 | /* char *var_debug_peer_list; |
| 6 | /* int var_debug_peer_level; | |
| 35140025 | 7 | /* int var_in_flow_delay; |
| 447bfc58 GS |
8 | +/* char *var_reject_reply_msg_access_denied; |
| 9 | /* int var_fault_inj_code; | |
| 417d7d5e AF |
10 | /* |
| 11 | /* void mail_params_init() | |
| 82e81937 | 12 | @@ -229,6 +230,7 @@ |
| 417d7d5e | 13 | char *var_export_environ; |
| 3ec179e4 AF |
14 | char *var_debug_peer_list; |
| 15 | int var_debug_peer_level; | |
| 417d7d5e | 16 | +char *var_reject_reply_msg_access_denied; |
| 447bfc58 | 17 | int var_fault_inj_code; |
| 417d7d5e | 18 | |
| 82e81937 TO |
19 | #define MAIN_CONF_FILE "main.cf" |
| 20 | @@ -458,6 +460,7 @@ | |
| 417d7d5e AF |
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, | |
| 25 | 0, | |
| 26 | }; | |
| 27 | static CONFIG_STR_FN_TABLE function_str_defaults_2[] = { | |
| 82e81937 TO |
28 | diff -ruN postfix-1.1.11/src/global/mail_params.h postfix-1.1.11.my/src/global/mail_params.h |
| 29 | --- postfix-1.1.11/src/global/mail_params.h Wed Sep 18 12:16:53 2002 | |
| 30 | +++ postfix-1.1.11.my/src/global/mail_params.h Wed Sep 18 12:08:12 2002 | |
| 31 | @@ -1612,6 +1612,13 @@ | |
| 32 | #define DEF_RESOLVE_DEQUOTED 1 | |
| 33 | extern bool var_resolve_dequoted; | |
| 35140025 TO |
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 | |
| 82e81937 TO |
45 | diff -ruN postfix-1.1.11/src/smtpd/smtpd.c postfix-1.1.11.my/src/smtpd/smtpd.c |
| 46 | --- postfix-1.1.11/src/smtpd/smtpd.c Wed Sep 18 12:16:53 2002 | |
| 47 | +++ postfix-1.1.11.my/src/smtpd/smtpd.c Wed Sep 18 12:08:12 2002 | |
| 48 | @@ -1863,6 +1863,7 @@ | |
| 447bfc58 | 49 | VAR_SMTPD_NOOP_CMDS, DEF_SMTPD_NOOP_CMDS, &var_smtpd_noop_cmds, 0, 0, |
| 82e81937 | 50 | VAR_SMTPD_NULL_KEY, DEF_SMTPD_NULL_KEY, &var_smtpd_null_key, 0, 0, |
| 35140025 TO |
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, | |
| 53 | 0, | |
| 54 | }; | |
| 55 | ||
| 82e81937 TO |
56 | diff -ruN postfix-1.1.11/src/smtpd/smtpd_check.c postfix-1.1.11.my/src/smtpd/smtpd_check.c |
| 57 | --- postfix-1.1.11/src/smtpd/smtpd_check.c Wed Sep 18 12:16:53 2002 | |
| 58 | +++ postfix-1.1.11.my/src/smtpd/smtpd_check.c Wed Sep 18 12:11:50 2002 | |
| 59 | @@ -1010,6 +1010,7 @@ | |
| 417d7d5e AF |
60 | char *reply_name, char *reply_class) |
| 61 | { | |
| 62 | char *myname = "check_relay_domains"; | |
| 63 | + VSTRING *reply_msg = vstring_alloc(1); | |
| 64 | ||
| 65 | if (msg_verbose) | |
| 66 | msg_info("%s: %s", myname, recipient); | |
| 82e81937 | 67 | @@ -1029,9 +1030,10 @@ |
| 417d7d5e AF |
68 | /* |
| 69 | * Deny relaying between sites that both are not in relay_domains. | |
| 70 | */ | |
| 82e81937 TO |
71 | + vstring_strcat(reply_msg, "%d <%s>: %s "); |
| 72 | + vstring_strcat(reply_msg, var_reject_reply_msg_access_denied); | |
| 417d7d5e | 73 | return (smtpd_check_reject(state, MAIL_ERROR_POLICY, |
| 82e81937 | 74 | - "%d <%s>: %s rejected: Relay access denied", |
| 417d7d5e | 75 | - var_relay_code, reply_name, reply_class)); |
| 82e81937 | 76 | + vstring_export(reply_msg), var_relay_code, reply_name, reply_class)); |
| 417d7d5e AF |
77 | } |
| 78 | ||
| 79 | /* permit_auth_destination - OK for message relaying */ | |
| 82e81937 | 80 | @@ -1088,6 +1090,7 @@ |
| 417d7d5e AF |
81 | static int reject_unauth_destination(SMTPD_STATE *state, char *recipient) |
| 82 | { | |
| 83 | char *myname = "reject_unauth_destination"; | |
| 84 | + VSTRING *reply_msg = vstring_alloc(1); | |
| 85 | ||
| 86 | if (msg_verbose) | |
| 87 | msg_info("%s: %s", myname, recipient); | |
| 82e81937 | 88 | @@ -1101,9 +1104,10 @@ |
| 417d7d5e AF |
89 | /* |
| 90 | * Reject relaying to sites that are not listed in relay_domains. | |
| 91 | */ | |
| 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)); | |
| 98 | } | |
| 99 | ||
| 100 | /* reject_unauth_pipelining - reject improper use of SMTP command pipelining */ |