From 8227dd78108668e6e4ea54be24f9a29ce53d66a7 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Sat, 20 Jul 2013 19:43:41 +0300 Subject: [PATCH] sendmail: Set milter macros for spamass-milter only if it's enabled --- sendmail/templates/sendmail.mc.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sendmail/templates/sendmail.mc.erb b/sendmail/templates/sendmail.mc.erb index 624c549..42ad39c 100644 --- a/sendmail/templates/sendmail.mc.erb +++ b/sendmail/templates/sendmail.mc.erb @@ -58,8 +58,8 @@ FEATURE(`blacklist_recipients')dnl EXPOSED_USER(`root')dnl dnl # <% if @sendmail_milter -%> -<% milters = @sendmail_milter.collect { |name,opts| name }.join(",") -%> -DAEMON_OPTIONS(`Port=smtp, Name=MTA, M=A, InputMailFilters=<%= milters %>')dnl +<% milters = @sendmail_milter.collect { |name,opts| name } -%> +DAEMON_OPTIONS(`Port=smtp, Name=MTA, M=A, InputMailFilters=<%= milters.join(",") %>')dnl <% else -%> DAEMON_OPTIONS(`Port=smtp, Name=MTA, M=A')dnl <% end -%> @@ -82,7 +82,9 @@ define(`confDOMAIN_NAME', `<%= @mail_domain %>')dnl define(`confDONT_BLAME_SENDMAIL', `GroupWritableDirpathSafe,GroupWritableIncludeFileSafe,GroupWritableForwardFile,ForwardFileInGroupWritableDirPath')dnl dnl # <% if @sendmail_milter -%> +<% if milters.include?("spamass") -%> define(`confMILTER_MACROS_ENVRCPT', `b, r, v, Z, 'confMILTER_MACROS_ENVRCPT)dnl +<% end -%> <% @sendmail_milter.each do |name,opts| -%> MAIL_FILTER<%= "(`%s', `%s')" % [name, opts] %> <% end -%>