diff -urN snapshot-20011114/src/global/mail_params.c snapshot-20011114.my/src/global/mail_params.c --- snapshot-20011114/src/global/mail_params.c Thu Nov 15 11:15:54 2001 +++ snapshot-20011114.my/src/global/mail_params.c Thu Nov 15 11:19:19 2001 @@ -70,6 +70,7 @@ /* char *var_debug_peer_list; /* int var_debug_peer_level; /* int var_in_flow_delay; +/* char *var_reject_reply_msg_access_denied; /* /* void mail_params_init() /* DESCRIPTION @@ -217,6 +218,7 @@ char *var_export_environ; char *var_debug_peer_list; int var_debug_peer_level; +char *var_reject_reply_msg_access_denied; /* check_myhostname - lookup hostname and validate */ @@ -357,6 +359,7 @@ VAR_SMTP_TLS_CLIST, DEF_SMTP_TLS_CLIST, &var_smtp_tls_cipherlist, 0, 0, VAR_SMTP_TLS_SCACHE_DB, DEF_SMTP_TLS_SCACHE_DB, &var_smtp_tls_scache_db, 0, 0, VAR_TLS_DAEMON_RAND_SOURCE, DEF_TLS_DAEMON_RAND_SOURCE, &var_tls_daemon_rand_source, 0, 0, + VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0, 0, }; static CONFIG_STR_FN_TABLE function_str_defaults_2[] = { diff -urN snapshot-20011114/src/global/mail_params.h snapshot-20011114.my/src/global/mail_params.h --- snapshot-20011114/src/global/mail_params.h Thu Nov 15 11:15:54 2001 +++ snapshot-20011114.my/src/global/mail_params.h Thu Nov 15 11:16:27 2001 @@ -1505,6 +1505,13 @@ #define DEF_IN_FLOW_DELAY "1s" extern int var_in_flow_delay; + /* + * SMTPD messages + */ +#define VAR_REJECT_REPLY_MSG_ACCESS_DENIED "smtpd_reject_msg_access_denied" +#define DEF_REJECT_REPLY_MSG_ACCESS_DENIED "rejected: Relay access denied." +extern char *var_reject_reply_msg_access_denied; + /* LICENSE /* .ad /* .fi diff -urN snapshot-20011114/src/smtpd/smtpd.c snapshot-20011114.my/src/smtpd/smtpd.c --- snapshot-20011114/src/smtpd/smtpd.c Thu Nov 15 11:15:54 2001 +++ snapshot-20011114.my/src/smtpd/smtpd.c Thu Nov 15 11:16:27 2001 @@ -1873,6 +1873,7 @@ VAR_FILTER_XPORT, DEF_FILTER_XPORT, &var_filter_xport, 0, 0, VAR_PERM_MX_NETWORKS, DEF_PERM_MX_NETWORKS, &var_perm_mx_networks, 0, 0, VAR_RELAY_CCERTS, DEF_RELAY_CCERTS, &var_relay_ccerts, 0, 0, + VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0, 0, }; diff -urN snapshot-20011114/src/smtpd/smtpd_check.c snapshot-20011114.my/src/smtpd/smtpd_check.c --- snapshot-20011114/src/smtpd/smtpd_check.c Thu Nov 15 11:15:54 2001 +++ snapshot-20011114.my/src/smtpd/smtpd_check.c Thu Nov 15 11:16:27 2001 @@ -941,6 +941,7 @@ char *reply_name, char *reply_class) { char *myname = "check_relay_domains"; + VSTRING *reply_msg = vstring_alloc(1); if (msg_verbose) msg_info("%s: %s", myname, recipient); @@ -960,9 +961,10 @@ /* * Deny relaying between sites that both are not in relay_domains. */ + vstring_strcat(reply_msg, "%d <%s>: %s "); + vstring_strcat(reply_msg, var_reject_reply_msg_access_denied); return (smtpd_check_reject(state, MAIL_ERROR_POLICY, - "%d <%s>: %s odrzucony/rejected: Relay access denied", - var_relay_code, reply_name, reply_class)); + vstring_export(reply_msg), var_relay_code, reply_name, reply_class)); } /* permit_auth_destination - OK for message relaying */ @@ -1023,6 +1025,7 @@ static int reject_unauth_destination(SMTPD_STATE *state, char *recipient) { char *myname = "reject_unauth_destination"; + VSTRING *reply_msg = vstring_alloc(1); if (msg_verbose) msg_info("%s: %s", myname, recipient); @@ -1036,9 +1039,10 @@ /* * Reject relaying to sites that are not listed in relay_domains. */ + vstring_strcat(reply_msg, "%d <%s>: "); + vstring_strcat(reply_msg, var_reject_reply_msg_access_denied); return (smtpd_check_reject(state, MAIL_ERROR_POLICY, - "%d <%s>: Relay access denied", - var_relay_code, recipient)); + vstring_export(reply_msg), var_relay_code, recipient)); } /* reject_unauth_pipelining - reject improper use of SMTP command pipelining */