head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.1.0.30
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.28
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.26
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.24
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.22
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.20
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.18
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.16
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.14
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.12
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.10
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.8
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.6
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.4
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.2
	pkgsrc-2009Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.12.06.10.48.51;	author roy;	state dead;
branches;
next	1.1;

1.1
date	2009.03.16.18.13.34;	author adrianp;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove stale patches
@
text
@$NetBSD: patch-ag,v 1.1 2009/03/16 18:13:34 adrianp Exp $

Add a custom configuration option in dspam.conf of "StripRcptDomain" which,
if selected, strips the RCPT TO domain from email processed through DSPAM.

--- src/daemon.c.orig	2006-08-03 18:27:00.000000000 +0100
+++ src/daemon.c	2006-08-03 19:29:22.000000000 +0100
@@@@ -571,6 +571,15 @@@@
           goto GETCMD;
         }
 
+	/* Chop of @@.* from the recipient */
+	if (_ds_match_attribute(agent_config, "StripRcptDomain", "on")) {
+	  strtok(username, "@@");
+	  if (username[0] == 0 || username[0] == '-') { 
+	    daemon_reply(TTX, LMTP_BAD_CMD, "5.1.2", ERR_LMTP_BAD_RCPT);
+	    goto GETCMD;
+	  }
+	}
+
         if (_ds_match_attribute(agent_config, "Broken", "case"))
           lc(username, username);
 
@


1.1
log
@Add two new patches to DSPAM:

1) Fix a bug when using SMTP/LMTP which can cause the mbox to be written
with trailing ^M's which causes the www interface to stop working.

2) Add a custom configuration option in dspam.conf of "StripRcptDomain" which,
if selected, strips the RCPT TO domain from email processed through DSPAM.
This is off by default.

PKGREVISION++
@
text
@d1 1
a1 1
$NetBSD$
@