diff -ruN postfix-1.1.11/src/global/mail_params.c postfix-1.1.11.my/src/global/mail_params.c --- postfix-1.1.11/src/global/mail_params.c Wed Sep 18 12:16:53 2002 +++ postfix-1.1.11.my/src/global/mail_params.c Wed Sep 18 12:08:12 2002 @@ -75,6 +75,7 @@ /* char *var_debug_peer_list; /* int var_debug_peer_level; /* int var_in_flow_delay; +/* char *var_reject_reply_msg_access_denied; /* int var_fault_inj_code; /* /* void mail_params_init() @@ -229,6 +230,7 @@ char *var_export_environ; char *var_debug_peer_list; int var_debug_peer_level; +char *var_reject_reply_msg_access_denied; int var_fault_inj_code; #define MAIN_CONF_FILE "main.cf" @@ -458,6 +460,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 -ruN postfix-1.1.11/src/global/mail_params.h postfix-1.1.11.my/src/global/mail_params.h --- postfix-1.1.11/src/global/mail_params.h Wed Sep 18 12:16:53 2002 +++ postfix-1.1.11.my/src/global/mail_params.h Wed Sep 18 12:08:12 2002 @@ -1612,6 +1612,13 @@ #define DEF_RESOLVE_DEQUOTED 1 extern bool var_resolve_dequoted; + /* + * 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 -ruN postfix-1.1.11/src/smtpd/smtpd.c postfix-1.1.11.my/src/smtpd/smtpd.c --- postfix-1.1.11/src/smtpd/smtpd.c Wed Sep 18 12:16:53 2002 +++ postfix-1.1.11.my/src/smtpd/smtpd.c Wed Sep 18 12:08:12 2002 @@ -1863,6 +1863,7 @@ VAR_SMTPD_NOOP_CMDS, DEF_SMTPD_NOOP_CMDS, &var_smtpd_noop_cmds, 0, 0, VAR_SMTPD_NULL_KEY, DEF_SMTPD_NULL_KEY, &var_smtpd_null_key, 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 -ruN postfix-1.1.11/src/smtpd/smtpd_check.c postfix-1.1.11.my/src/smtpd/smtpd_check.c --- postfix-1.1.11/src/smtpd/smtpd_check.c Wed Sep 18 12:16:53 2002 +++ postfix-1.1.11.my/src/smtpd/smtpd_check.c Wed Sep 18 12:11:50 2002 @@ -1010,6 +1010,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); @@ -1029,9 +1030,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 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 */ @@ -1088,6 +1090,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); @@ -1101,9 +1104,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 */