diff options
author | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-13 17:09:43 -0400 |
---|---|---|
committer | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-13 17:09:43 -0400 |
commit | 4a38b4b1a48b67baf997453227c9d4a1bb810523 (patch) | |
tree | 0321c07f5267806b55ad025df8c13968ac17ba94 /config/postfix/postfix_acl.xml | |
parent | 080fb922c15c959be4f0bd101d0cf3f529f0e866 (diff) | |
parent | 3eddd42b1d0da5bdf5faec0e5036ef30347fa0a3 (diff) | |
download | pfsense-packages-4a38b4b1a48b67baf997453227c9d4a1bb810523.tar.gz pfsense-packages-4a38b4b1a48b67baf997453227c9d4a1bb810523.tar.bz2 pfsense-packages-4a38b4b1a48b67baf997453227c9d4a1bb810523.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/postfix/postfix_acl.xml')
-rw-r--r-- | config/postfix/postfix_acl.xml | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/config/postfix/postfix_acl.xml b/config/postfix/postfix_acl.xml index efc72721..4eeda7a4 100644 --- a/config/postfix/postfix_acl.xml +++ b/config/postfix/postfix_acl.xml @@ -5,11 +5,11 @@ <copyright> <![CDATA[ /* $Id$ */ -/* ========================================================================== */ +/* ========================================================================== */post /* postfix.xml part of the Postfix package for pfSense - Copyright (C) 2010 Marcello Coutinho + Copyright (C) 2011-2013 Marcello Coutinho All rights reserved. */ /* ========================================================================== */ @@ -17,10 +17,10 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, + 1. Redistributions of source code MUST retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright + 2. Redistributions in binary form MUST reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. @@ -115,6 +115,20 @@ <encoding>base64</encoding> </field> <field> + <fielddescr>Helo</fielddescr> + <fieldname>helo_maps</fieldname> + <description><![CDATA[<strong>PCRE filters</strong><a href=http://www.postfix.org/pcre_table.5.html> that are applied to initial message helo info. Hint:<br> + /^tmpstr.*/ REJECT<br> + /^myserver.local/ REJECT external server with local domain info<br> + /^trusted_network.local/ DUNNO trusted remote misconfigured server<br> + See http://www.postfix.org/postconf.5.html#smtpd_helo_restrictions for more help]]> + </description> + <type>textarea</type> + <cols>83</cols> + <rows>15</rows> + <encoding>base64</encoding> + </field> + <field> <fielddescr>Sender</fielddescr> <fieldname>sender_access</fieldname> <description><![CDATA[<strong>HASH filters</strong> that implements whitelisting and blacklisting of full or partial email addresses and domains as specified in the MAIL FROM field :<br> |