1 --- snapshot-20010525/src/global/mail_params.h.wiget Tue May 29 16:39:02 2001
2 +++ snapshot-20010525/src/global/mail_params.h Tue May 29 16:39:02 2001
4 #define DEF_SYSLOG_NAME "postfix"
5 extern char *var_syslog_name;
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;
17 --- snapshot-20010525/src/global/mail_params.c.wiget Tue May 29 16:39:02 2001
18 +++ snapshot-20010525/src/global/mail_params.c Tue May 29 16:41:04 2001
20 /* char *var_export_environ;
21 /* char *var_debug_peer_list;
22 /* int var_debug_peer_level;
23 +/* char *var_reject_reply_msg_access_denied;
25 /* void mail_params_init()
28 char *var_export_environ;
29 char *var_debug_peer_list;
30 int var_debug_peer_level;
31 +char *var_reject_reply_msg_access_denied;
33 /* check_myhostname - lookup hostname and validate */
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,
42 static CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
43 --- snapshot-20010525/src/smtpd/smtpd_check.c.wiget Tue May 29 16:39:02 2001
44 +++ snapshot-20010525/src/smtpd/smtpd_check.c Tue May 29 16:39:02 2001
46 char *reply_name, char *reply_class)
48 char *myname = "check_relay_domains";
49 + VSTRING *reply_msg = vstring_alloc(1);
52 msg_info("%s: %s", myname, recipient);
55 * Deny relaying between sites that both are not in relay_domains.
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));
65 /* permit_auth_destination - OK for message relaying */
67 static int reject_unauth_destination(SMTPD_STATE *state, char *recipient)
69 char *myname = "reject_unauth_destination";
70 + VSTRING *reply_msg = vstring_alloc(1);
73 msg_info("%s: %s", myname, recipient);
76 * Reject relaying to sites that are not listed in relay_domains.
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));
86 /* reject_unauth_pipelining - reject improper use of SMTP command pipelining */
87 --- snapshot-20010525/src/smtpd/smtpd.c.wiget Tue May 29 16:39:02 2001
88 +++ snapshot-20010525/src/smtpd/smtpd.c Tue May 29 16:39:02 2001
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,