Skip to content

Allow for empty smtp/smtpd content filter #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thomasvs wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow for empty smtp/smtpd content filter #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d20ffe4
Allow for empty content_filter
Aug 27, 2016
a353a54
use ! and .empty?
Aug 27, 2016
5f1898f
Actually, can't use .empty on a nil, so rolling back
Aug 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion templates/master.cf-el5.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
smtp inet n - n - - smtpd
<% if @smtp_content_filter -%>
<% @smtp_content_filter.each do |content_filter| -%>
-o content_filter=<%= content_filter %>
<% end -%>
<% end -%>
<% if @submission -%>
submission inet n - n - - smtpd
-o smtpd_enforce_tls=<%= @submission_smtpd_enforce_tls %>
Expand All @@ -21,10 +23,12 @@ smtps inet n - n - - smtpd
-o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
<% @smtp_content_filter.each do |content_filter| -%>
<% if @smtps_content_filter -%>
<% @smtps_content_filter.each do |content_filter| -%>
-o content_filter=<%= content_filter %>
<% end -%>
<% end -%>
<% end -%>
#628 inet n - n - - qmqpd
pickup fifo n - n 60 1 pickup
cleanup unix n - n - 0 cleanup
Expand Down
4 changes: 4 additions & 0 deletions templates/master.cf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ tlsproxy unix - - n - 0 tlsproxy
dnsblog unix - - n - 0 dnsblog
smtpd pass - - n - - smtpd
<% end -%>
<% if @smtp_content_filter -%>
<% @smtp_content_filter.each do |content_filter| -%>
-o content_filter=<%= content_filter %>
<% end -%>
<% end -%>
<% if @submission -%>
submission inet n - n - - smtpd
-o smtpd_tls_security_level=<%= @submission_smtpd_tls_security_level %>
Expand All @@ -32,10 +34,12 @@ smtps inet n - n - - smtpd
-o smtpd_sasl_auth_enable=<%= @smtps_smtpd_sasl_auth_enable %>
-o smtpd_client_restrictions=<%= @smtps_smtpd_client_restrictions %>
-o milter_macro_daemon_name=ORIGINATING
<% if @smtps_content_filter -%>
<% @smtps_content_filter.each do |content_filter| -%>
-o content_filter=<%= content_filter %>
<% end -%>
<% end -%>
<% end -%>
#628 inet n - n - - qmqpd
pickup fifo n - n 60 1 pickup
cleanup unix n - n - 0 cleanup
Expand Down