X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=postfix-conf_msg.patch;h=527dc61e34fff98ed203fead0c5e557c7dcce643;hb=d3dab29523884b1870c040b4d1e9afe1e17c837f;hp=bf25ae0fb1a12f3bf14669a16290baad68aa8fad;hpb=417d7d5ee4efa69d72f15cbbca80ca85f2131a17;p=packages%2Fpostfix.git

diff --git a/postfix-conf_msg.patch b/postfix-conf_msg.patch
index bf25ae0..527dc61 100644
--- a/postfix-conf_msg.patch
+++ b/postfix-conf_msg.patch
@@ -1,8 +1,8 @@
---- snapshot-20010329/src/global/mail_params.h.wiget	Thu Apr 26 14:55:19 2001
-+++ snapshot-20010329/src/global/mail_params.h	Thu Apr 26 14:55:20 2001
-@@ -1423,6 +1423,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
@@ -14,83 +14,40 @@
  /* LICENSE
  /* .ad
  /* .fi
---- snapshot-20010329/src/global/mail_params.c.wiget	Thu Apr 26 14:55:19 2001
-+++ snapshot-20010329/src/global/mail_params.c	Thu Apr 26 14:55:20 2001
-@@ -65,6 +65,7 @@
- /*
- /*	char	*var_import_environ;
- /*	char	*var_export_environ;
-+/*  char 	*var_reject_reply_msg_access_denied;
- /*
- /*	void	mail_params_init()
- /* DESCRIPTION
-@@ -206,6 +207,7 @@
- 
- char   *var_import_environ;
- char   *var_export_environ;
-+char   *var_reject_reply_msg_access_denied;
- 
- /* check_myhostname - lookup hostname and validate */
- 
-@@ -343,6 +345,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, 
+--- src/smtpd/smtpd.c.orig	2004-06-22 14:32:57.338808646 +0200
++++ src/smtpd/smtpd.c	2004-06-22 14:41:40.372360162 +0200
+@@ -4514,6 +4514,7 @@
+ 	VAR_MILT_DEF_ACTION, DEF_MILT_DEF_ACTION, &var_milt_def_action, 1, 0,
+ 	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_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-20010329/src/smtpd/smtpd_check.c.wiget	Thu Apr 26 14:55:20 2001
-+++ snapshot-20010329/src/smtpd/smtpd_check.c	Thu Apr 26 15:17:10 2001
-@@ -823,6 +823,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);
-@@ -842,9 +843,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 */
-@@ -902,6 +904,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);
-@@ -915,9 +918,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-20010329/src/smtpd/smtpd.c.wiget	Thu Apr 26 14:55:19 2001
-+++ snapshot-20010329/src/smtpd/smtpd.c	Thu Apr 26 14:55:20 2001
-@@ -1734,6 +1734,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, 
+     static CONFIG_RAW_TABLE raw_table[] = {
+--- src/global/mail_params.c	2006-06-15 02:50:02.000000000 +0200
++++ src/global/mail_params.c-new	2006-07-11 19:29:07.162325784 +0200
+@@ -78,6 +78,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;
+@@ -246,6 +247,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;
+@@ -488,6 +490,7 @@
+ 	VAR_FLUSH_SERVICE, DEF_FLUSH_SERVICE, &var_flush_service, 1, 0,
+ 	VAR_VERIFY_SERVICE, DEF_VERIFY_SERVICE, &var_verify_service, 1, 0,
+ 	VAR_TRACE_SERVICE, DEF_TRACE_SERVICE, &var_trace_service, 1, 0,
+	VAR_INT_FILT_CLASSES, DEF_INT_FILT_CLASSES, &var_int_filt_classes, 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[] = {