From 8b4710cec33d04a1081e3e9e66c923688cd8a91c Mon Sep 17 00:00:00 2001
From: Andre Keller <andre.keller@vshn.ch>
Date: Tue, 24 May 2016 18:00:34 +0200
Subject: [PATCH] Add option to specify command arguments for the smtpd
 process.

---
 manifests/server.pp         | 1 +
 templates/master.cf-el5.erb | 6 ++++++
 templates/master.cf.erb     | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/manifests/server.pp b/manifests/server.pp
index 94a43cf..7ec8d36 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -77,6 +77,7 @@
   $smtp_tls_note_starttls_offer = false,
   $smtp_tls_mandatory_ciphers = undef,
   $smtpd_tls_ask_ccert = false,
+  $smtpd_command_args = [],
   $tls_append_default_CA = false,
   $smtp_sasl_tls = false,
   $smtp_use_tls = false,
diff --git a/templates/master.cf-el5.erb b/templates/master.cf-el5.erb
index 760041e..6b6ea25 100644
--- a/templates/master.cf-el5.erb
+++ b/templates/master.cf-el5.erb
@@ -10,6 +10,9 @@ smtp      inet  n       -       n       -       -       smtpd
 <% @smtp_content_filter.each do |content_filter| -%>
   -o content_filter=<%= content_filter %>
 <% end -%>
+<% @smtpd_command_args.each do |command_arg| -%>
+  -o <%= command_arg %>
+<% end -%>
 <% if @submission -%>
 submission inet n       -       n       -       -       smtpd
   -o smtpd_enforce_tls=<%= @submission_smtpd_enforce_tls %>
@@ -24,6 +27,9 @@ smtps     inet  n       -       n       -       -       smtpd
 <% @smtp_content_filter.each do |content_filter| -%>
   -o content_filter=<%= content_filter %>
 <% end -%>
+<% @smtpd_command_args.each do |command_arg| -%>
+  -o <%= command_arg %>
+<% end -%>
 <% end -%>
 #628      inet  n       -       n       -       -       qmqpd
 pickup    fifo  n       -       n       60      1       pickup
diff --git a/templates/master.cf.erb b/templates/master.cf.erb
index 248face..ac62248 100644
--- a/templates/master.cf.erb
+++ b/templates/master.cf.erb
@@ -19,6 +19,9 @@ smtpd     pass  -       -       n       -       -       smtpd
 <% @smtp_content_filter.each do |content_filter| -%>
   -o content_filter=<%= content_filter %>
 <% end -%>
+<% @smtpd_command_args.each do |command_arg| -%>
+  -o <%= command_arg %>
+<% end -%>
 <% if @submission -%>
 submission inet n       -       n       -       -       smtpd
   -o smtpd_tls_security_level=<%= @submission_smtpd_tls_security_level %>
@@ -35,6 +38,9 @@ smtps     inet  n       -       n       -       -       smtpd
 <% @smtps_content_filter.each do |content_filter| -%>
   -o content_filter=<%= content_filter %>
 <% end -%>
+<% @smtpd_command_args.each do |command_arg| -%>
+  -o <%= command_arg %>
+<% end -%>
 <% end -%>
 #628      inet  n       -       n       -       -       qmqpd
 pickup    fifo  n       -       n       60      1       pickup