From f42593287dae5e6d667e300b123e517851c62ee6 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 29 Jan 2006 00:36:19 +0000
Subject: Seperate 25:5:864 into three boxes passtime, greyexp and whiteexp

---
 packages/spamd.inc          | 13 +++++++++++--
 packages/spamd_settings.xml | 30 +++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/packages/spamd.inc b/packages/spamd.inc
index 5e5e33e4..6f8b6d16 100644
--- a/packages/spamd.inc
+++ b/packages/spamd.inc
@@ -37,7 +37,9 @@ function sync_package_spamd() {
 		fwrite($fd, $spamd['ip'] . "\n");
 	}
 	fclose($fd);
-	$passtime = "5:4:864";
+	$passtime = "5";
+	$greyexp = "4";
+	$whiteexp = "864";
 	$identifier = "";
 	$greylisting = " -g";
 	$maxcon = "";
@@ -66,12 +68,19 @@ function sync_package_spamd() {
 				$window = " -w " . $ss['window'];
 			if($ss['replysmtperror'] <> "")
 				$replysmtperror = " -r " . $ss['replysmtperror'];
+			if($ss['passtime'] <> "")
+				$passtime = $ss['passtime'];
+			if($ss['greyexp'] <> "")
+				$greyexp = $ss['greyexp'];
+			if($ss['whiteexp'] <> "")
+				$whiteexp = $ss['whiteexp'];			
 		}
 	}
+	$greyparms = " -G {$passtime}:{$greyexp}:{$whiteexp}";
 	$start = "/usr/local/sbin/spamd-setup &\n" .
 		 "/sbin/pflogd &\n" .
 		 "/sbin/mount_fdescfs fdescfs /dev/fd\n" .
-		 "/usr/local/libexec/spamd {$passtime}{$identifier}{$greylisting}{$maxcon}{$maxblack}{$window}{$replysmtperror} -b 127.0.0.1 &\n" .
+		 "/usr/local/libexec/spamd {$greyparms}{$identifier}{$greylisting}{$maxcon}{$maxblack}{$window}{$replysmtperror} -b 127.0.0.1 &\n" .
 		 "/usr/local/libexec/spamlogd\n";
 	$stop  = "/usr/bin/killall spamd-setup\n" .
 		 "/usr/bin/killall spamlogd\n" .
diff --git a/packages/spamd_settings.xml b/packages/spamd_settings.xml
index 4e9fb0ab..7089a2fb 100644
--- a/packages/spamd_settings.xml
+++ b/packages/spamd_settings.xml
@@ -71,6 +71,33 @@
 			<size>30</size>
 			<value>25:4:864</value>
 		</field>
+
+		<field>
+			<fielddescr>Passtime</fielddescr>
+			<fieldname>passtime</fieldname>
+			<description>Adjust the three time parameters for greylisting; see GREYLISTING.  passtime defaults to 25 (minutes).</description>
+			<type>input</type>
+			<size>30</size>
+			<value>25:4:864</value>
+		</field>
+		<field>
+			<fielddescr>GreyExp</fielddescr>
+			<fieldname>greyexp</fieldname>
+			<description>greyexp to 4</description>
+			<type>input</type>
+			<size>30</size>
+			<value>25:4:864</value>
+		</field>
+		<field>
+			<fielddescr>White Exp</fielddescr>
+			<fieldname>whiteexp</fieldname>
+			<description>whiteexp to 864 (hours, approximately 36 days).</description>
+			<type>input</type>
+			<size>30</size>
+			<value>25:4:864</value>
+		</field>			
+
+
 		<field>
 			<fielddescr>Stutter Secs</fielddescr>
 			<fieldname>stuttersecs</fieldname>
@@ -100,11 +127,12 @@
 			<value>450</value>
 			<size>1</size>
 			<options>
+			    <option><value></value><name></name></option>
 			    <option><value>450</value><name>450</name></option>
 			    <option><value>451</value><name>451</name></option>
 			    <option><value>550</value><name>550</name></option>
 			</options>
-		</field>			
+		</field>
 		<field>
 			<fielddescr>NextMTA</fielddescr>
 			<fieldname>nextmta</fieldname>
-- 
cgit v1.2.3