-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;
+--- 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
-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 */
-diff -ruN postfix-1.1.11/src/smtpd/smtpd.c postfix-1.1.11.my/src/smtpd/smtpd.c
---- postfix.orig/src/smtpd/smtpd.c Wed Sep 18 12:16:53 2002
-+++ postfix/src/smtpd/smtpd.c Wed Sep 18 12:08:12 2002
-@@ -2004,6 +2004,7 @@
- VAR_VERP_CLIENTS, DEF_VERP_CLIENTS, &var_verp_clients, 0, 0,
- VAR_RELAY_CCERTS, DEF_RELAY_CCERTS, &var_relay_ccerts, 0, 0,
- VAR_SMTPD_SASL_TLS_OPTS, DEF_SMTPD_SASL_TLS_OPTS, &var_smtpd_sasl_tls_opts, 0, 0,
-+ VAR_REJECT_REPLY_MSG_ACCESS_DENIED, DEF_REJECT_REPLY_MSG_ACCESS_DENIED, &var_reject_reply_msg_access_denied, 1, 0,
+--- 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;
+ /* 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;
+ 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_RAW_TABLE raw_table[] = {
+ static const CONFIG_STR_FN_TABLE function_str_defaults_2[] = {
projects / packages / postfix.git / blobdiff