---- snapshot-20010525/src/global/mail_params.h.wiget Tue May 29 16:39:02 2001
-+++ snapshot-20010525/src/global/mail_params.h Tue May 29 16:39:02 2001
-@@ -1434,6 +1434,13 @@
- #define DEF_SYSLOG_NAME "postfix"
- extern char *var_syslog_name;
+--- src/global/mail_params.h.orig 2004-06-22 14:32:58.615734426 +0200
++++ src/global/mail_params.h 2004-06-22 14:33:21.260418134 +0200
+@@ -2204,6 +2204,13 @@
+ extern char *var_anvil_service;
+ #endif
+ /*
+ * SMTPD messages
/* LICENSE
/* .ad
/* .fi
---- snapshot-20010525/src/global/mail_params.c.wiget Tue May 29 16:39:02 2001
-+++ snapshot-20010525/src/global/mail_params.c Tue May 29 16:41:04 2001
-@@ -67,6 +67,7 @@
- /* char *var_export_environ;
+--- src/smtpd/smtpd.c.orig 2009-05-25 19:13:15.584397697 +0200
++++ src/smtpd/smtpd.c 2009-05-25 19:14:31.066487776 +0200
+@@ -5062,6 +5062,7 @@
+ VAR_MILT_DAEMON_NAME, DEF_MILT_DAEMON_NAME, &var_milt_daemon_name, 1, 0,
+ VAR_MILT_V, DEF_MILT_V, &var_milt_v, 1, 0,
+ VAR_STRESS, DEF_STRESS, &var_stress, 0, 0,
++ VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
+ VAR_UNV_FROM_WHY, DEF_UNV_FROM_WHY, &var_unv_from_why, 0, 0,
+ VAR_UNV_RCPT_WHY, DEF_UNV_RCPT_WHY, &var_unv_rcpt_why, 0, 0,
+ VAR_REJECT_TMPF_ACT, DEF_REJECT_TMPF_ACT, &var_reject_tmpf_act, 1, 0,
+--- src/global/mail_params.c.orig 2010-04-05 21:25:33.331592727 +0200
++++ src/global/mail_params.c 2010-04-05 21:27:01.504746061 +0200
+@@ -80,6 +80,7 @@
/* char *var_debug_peer_list;
/* int var_debug_peer_level;
-+/* char *var_reject_reply_msg_access_denied;
- /*
- /* void mail_params_init()
- /* DESCRIPTION
-@@ -210,6 +211,7 @@
+ /* int var_in_flow_delay;
++/* char *var_reject_reply_msg_access_denied;
+ /* int var_fault_inj_code;
+ /* char *var_bounce_service;
+ /* char *var_cleanup_service;
+@@ -265,6 +266,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 */
-
-@@ -348,6 +350,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,
++char *var_reject_reply_msg_access_denied;
+ int var_fault_inj_code;
+ char *var_bounce_service;
+ char *var_cleanup_service;
+@@ -569,6 +571,7 @@
+ VAR_INT_FILT_CLASSES, DEF_INT_FILT_CLASSES, &var_int_filt_classes, 0, 0,
+ /* multi_instance_wrapper may have dependencies but not dependents. */
+ VAR_MULTI_WRAPPER, DEF_MULTI_WRAPPER, &var_multi_wrapper, 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[] = {
---- snapshot-20010525/src/smtpd/smtpd_check.c.wiget Tue May 29 16:39:02 2001
-+++ snapshot-20010525/src/smtpd/smtpd_check.c Tue May 29 16:39:02 2001
-@@ -890,6 +890,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);
-@@ -909,9 +910,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 */
-@@ -970,6 +972,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);
-@@ -983,9 +986,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 */
---- snapshot-20010525/src/smtpd/smtpd.c.wiget Tue May 29 16:39:02 2001
-+++ snapshot-20010525/src/smtpd/smtpd.c Tue May 29 16:39:02 2001
-@@ -1804,6 +1804,7 @@
- VAR_SMTPD_SASL_REALM, DEF_SMTPD_SASL_REALM, &var_smtpd_sasl_realm, 1, 0,
- VAR_FILTER_XPORT, DEF_FILTER_XPORT, &var_filter_xport, 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,
- };
-
+ static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
projects / packages / postfix.git / blobdiff