* Add support for passing emails

 * Bring in some changes from proxsmtp

3 files changed, 16 insertions, 9 deletions

diff --git a/doc/clamsmtpd.8 b/doc/clamsmtpd.8
index 3a87066..ee8d08c 100644
--- a/doc/clamsmtpd.8
+++ b/doc/clamsmtpd.8
@@ -127,7 +127,7 @@ original destination after being scanned.
 .Pp
 When doing transparent proxying for outgoing email it's probably a good idea to 
 turn on bounce notifications using the
-.Ar Bounce
+.Ar Action: bounce
 setting. Also note that some features (such as SSL/TLS) will not be available
 when going through the transparent proxy. 
 .Pp
diff --git a/doc/clamsmtpd.conf b/doc/clamsmtpd.conf
index 934289d..c50dcc6 100644
--- a/doc/clamsmtpd.conf
+++ b/doc/clamsmtpd.conf
@@ -37,8 +37,8 @@ OutAddress: 10026
 # Directory for temporary files
 #TempDirectory: /tmp
 
-# Whether or not to bounce email (default is to silently drop)
-#Bounce: off
+# What to do when we see a virus (use 'bounce' or 'pass' or 'drop'
+#Action: drop
 
 # Whether or not to keep virus files
 #Quarantine: off
diff --git a/doc/clamsmtpd.conf.5 b/doc/clamsmtpd.conf.5
index 13268d1..29abe55 100644
--- a/doc/clamsmtpd.conf.5
+++ b/doc/clamsmtpd.conf.5
@@ -68,14 +68,21 @@ directory of the clamsmtp distribution.
 .Sh SETTINGS
 The various settings are as follows:
 .Bl -tag -width Fl
-.It Ar Bounce
-When this flag is set 
+.It Ar Action
+This option controls what 
 .Xr clamsmtpd 8
-actively rejects messages with viruses. This may cause the sender to receive
-a message back notifying them of the virus. In most cases this is not a good
-idea since many viruses spoof sender addresses. 
+does when it finds a virus. The options are:
+.Bl -inset
+.It Ar bounce 
+Bounce the email. In most cases this is not a good idea since many viruses 
+spoof sender addresses. 
+.It Ar drop 
+Silently drop the email. Recommended.
+.It Ar pass
+Pass on the email. Inserts an 'X-Virus-Infected' header.
+.El
 .Pp
-[ Default: off ]
+[ Default: drop ]
 .It Ar ClamAddress
 Specifies the address to connect to 
 .Xr clamd 8