projects / packages / postfix.git / blame
| Commit | Line | Data |
|---|---|---|
| 417d7d5e AF |
1 | --- snapshot-20010329/src/global/mail_params.h.wiget Thu Apr 26 14:55:19 2001 |
| 2 | +++ snapshot-20010329/src/global/mail_params.h Thu Apr 26 14:55:20 2001 | |
| 3 | @@ -1423,6 +1423,13 @@ | |
| 4 | #define DEF_SYSLOG_NAME "postfix" | |
| 5 | extern char *var_syslog_name; | |
| 6 | ||
| 7 | + /* | |
| 8 | + * SMTPD messages | |
| 9 | + */ | |
| 10 | +#define VAR_REJECT_REPLY_MSG_ACCESS_DENIED "smtpd_reject_msg_access_denied" | |
| 11 | +#define DEF_REJECT_REPLY_MSG_ACCESS_DENIED "rejected: Relay access denied." | |
| 12 | +extern char *var_reject_reply_msg_access_denied; | |
| 13 | + | |
| 14 | /* LICENSE | |
| 15 | /* .ad | |
| 16 | /* .fi | |
| 17 | --- snapshot-20010329/src/global/mail_params.c.wiget Thu Apr 26 14:55:19 2001 | |
| 18 | +++ snapshot-20010329/src/global/mail_params.c Thu Apr 26 14:55:20 2001 | |
| 19 | @@ -65,6 +65,7 @@ | |
| 20 | /* | |
| 21 | /* char *var_import_environ; | |
| 22 | /* char *var_export_environ; | |
| 23 | +/* char *var_reject_reply_msg_access_denied; | |
| 24 | /* | |
| 25 | /* void mail_params_init() | |
| 26 | /* DESCRIPTION | |
| 27 | @@ -206,6 +207,7 @@ | |
| 28 | ||
| 29 | char *var_import_environ; | |
| 30 | char *var_export_environ; | |
| 31 | +char *var_reject_reply_msg_access_denied; | |
| 32 | ||
| 33 | /* check_myhostname - lookup hostname and validate */ | |
| 34 | ||
| 35 | @@ -343,6 +345,7 @@ | |
| 36 | VAR_SMTP_TLS_CLIST, DEF_SMTP_TLS_CLIST, &var_smtp_tls_cipherlist, 0, 0, | |
| 37 | VAR_SMTP_TLS_SCACHE_DB, DEF_SMTP_TLS_SCACHE_DB, &var_smtp_tls_scache_db, 0, 0, | |
| 38 | VAR_TLS_DAEMON_RAND_SOURCE, DEF_TLS_DAEMON_RAND_SOURCE, &var_tls_daemon_rand_source, 0, 0, | |
| 39 | + VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0, | |
| 40 | 0, | |
| 41 | }; | |
| 42 | static CONFIG_STR_FN_TABLE function_str_defaults_2[] = { | |
| 43 | --- snapshot-20010329/src/smtpd/smtpd_check.c.wiget Thu Apr 26 14:55:20 2001 | |
| 44 | +++ snapshot-20010329/src/smtpd/smtpd_check.c Thu Apr 26 15:17:10 2001 | |
| 45 | @@ -823,6 +823,7 @@ | |
| 46 | char *reply_name, char *reply_class) | |
| 47 | { | |
| 48 | char *myname = "check_relay_domains"; | |
| 49 | + VSTRING *reply_msg = vstring_alloc(1); | |
| 50 | ||
| 51 | if (msg_verbose) | |
| 52 | msg_info("%s: %s", myname, recipient); | |
| 53 | @@ -842,9 +843,10 @@ | |
| 54 | /* | |
| 55 | * Deny relaying between sites that both are not in relay_domains. | |
| 56 | */ | |
| 57 | + vstring_strcat(reply_msg, "%d <%s>: %s "); | |
| 58 | + vstring_strcat(reply_msg, var_reject_reply_msg_access_denied); | |
| 59 | return (smtpd_check_reject(state, MAIL_ERROR_POLICY, | |
| 60 | - "%d <%s>: %s odrzucony/rejected: Relay access denied", | |
| 61 | - var_relay_code, reply_name, reply_class)); | |
| 62 | + vstring_export(reply_msg), var_relay_code, reply_name, reply_class)); | |
| 63 | } | |
| 64 | ||
| 65 | /* permit_auth_destination - OK for message relaying */ | |
| 66 | @@ -902,6 +904,7 @@ | |
| 67 | static int reject_unauth_destination(SMTPD_STATE *state, char *recipient) | |
| 68 | { | |
| 69 | char *myname = "reject_unauth_destination"; | |
| 70 | + VSTRING *reply_msg = vstring_alloc(1); | |
| 71 | ||
| 72 | if (msg_verbose) | |
| 73 | msg_info("%s: %s", myname, recipient); | |
| 74 | @@ -915,9 +918,10 @@ | |
| 75 | /* | |
| 76 | * Reject relaying to sites that are not listed in relay_domains. | |
| 77 | */ | |
| 78 | + vstring_strcat(reply_msg, "%d <%s>: "); | |
| 79 | + vstring_strcat(reply_msg, var_reject_reply_msg_access_denied); | |
| 80 | return (smtpd_check_reject(state, MAIL_ERROR_POLICY, | |
| 81 | - "%d <%s>: Relay access denied", | |
| 82 | - var_relay_code, recipient)); | |
| 83 | + vstring_export(reply_msg), var_relay_code, recipient)); | |
| 84 | } | |
| 85 | ||
| 86 | /* reject_unauth_pipelining - reject improper use of SMTP command pipelining */ | |
| 87 | --- snapshot-20010329/src/smtpd/smtpd.c.wiget Thu Apr 26 14:55:19 2001 | |
| 88 | +++ snapshot-20010329/src/smtpd/smtpd.c Thu Apr 26 14:55:20 2001 | |
| 89 | @@ -1734,6 +1734,7 @@ | |
| 90 | VAR_SMTPD_SASL_REALM, DEF_SMTPD_SASL_REALM, &var_smtpd_sasl_realm, 1, 0, | |
| 91 | VAR_FILTER_XPORT, DEF_FILTER_XPORT, &var_filter_xport, 0, 0, | |
| 92 | VAR_RELAY_CCERTS, DEF_RELAY_CCERTS, &var_relay_ccerts, 0, 0, | |
| 93 | + VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0, | |
| 94 | 0, | |
| 95 | }; | |
| 96 |