projects / packages / postfix.git / blame
| Commit | Line | Data |
|---|---|---|
| 35140025 TO |
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 | |
| 4 | @@ -70,6 +70,7 @@ | |
| 3ec179e4 AF |
5 | /* char *var_debug_peer_list; |
| 6 | /* int var_debug_peer_level; | |
| 35140025 TO |
7 | /* int var_in_flow_delay; |
| 8 | +/* char *var_reject_reply_msg_access_denied; | |
| 417d7d5e AF |
9 | /* |
| 10 | /* void mail_params_init() | |
| 11 | /* DESCRIPTION | |
| 35140025 | 12 | @@ -217,6 +218,7 @@ |
| 417d7d5e | 13 | char *var_export_environ; |
| 3ec179e4 AF |
14 | char *var_debug_peer_list; |
| 15 | int var_debug_peer_level; | |
| 417d7d5e AF |
16 | +char *var_reject_reply_msg_access_denied; |
| 17 | ||
| 18 | /* check_myhostname - lookup hostname and validate */ | |
| 19 | ||
| 35140025 | 20 | @@ -357,6 +359,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[] = { | |
| 35140025 TO |
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; | |
| 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 -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 | |
| 48 | @@ -1873,6 +1873,7 @@ | |
| 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, | |
| 53 | 0, | |
| 54 | }; | |
| 55 | ||
| 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 | |
| 59 | @@ -941,6 +941,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); | |
| 35140025 | 67 | @@ -960,9 +961,10 @@ |
| 417d7d5e AF |
68 | /* |
| 69 | * Deny relaying between sites that both are not in relay_domains. | |
| 70 | */ | |
| 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)); | |
| 77 | } | |
| 78 | ||
| 79 | /* permit_auth_destination - OK for message relaying */ | |
| 35140025 | 80 | @@ -1023,6 +1025,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); | |
| 35140025 | 88 | @@ -1036,9 +1039,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 */ |