aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2006-01-29 00:00:00 +0000
committerScott Ullrich <sullrich@pfsense.org>2006-01-29 00:00:00 +0000
commitb5753ece302dce0bf14bd5fd2a87877bfd3864f6 (patch)
treee7baa62e7edd11d64854b59ffd3ae312590ff7b4 /packages
parent32cef3f6dde37080e8230657b8939f7ce0cfdcac (diff)
downloadpfsense-packages-b5753ece302dce0bf14bd5fd2a87877bfd3864f6.tar.gz
pfsense-packages-b5753ece302dce0bf14bd5fd2a87877bfd3864f6.tar.bz2
pfsense-packages-b5753ece302dce0bf14bd5fd2a87877bfd3864f6.zip
Add reply support
Diffstat (limited to 'packages')
-rw-r--r--packages/spamd.inc8
-rw-r--r--packages/spamd_settings.xml13
2 files changed, 17 insertions, 4 deletions
diff --git a/packages/spamd.inc b/packages/spamd.inc
index 897aaeda..514dd9d9 100644
--- a/packages/spamd.inc
+++ b/packages/spamd.inc
@@ -63,14 +63,16 @@ function sync_package_spamd() {
if($ss['delaysecs'] <> "")
$delaysecs = " -s " . $ss['delaysecs'];
if($ss['window'] <> "")
- $window = " -w " . $ss['window'];
+ $window = " -w " . $ss['window'];
+ if($ss['replysmtperror'] <> "")
+ $replysmtperror = " -r " . $ss['replysmtperror'];
}
}
$start = "/usr/local/sbin/spamd-setup &\n" .
"/sbin/pflogd &\n" .
"/sbin/mount_fdescfs fdescfs /dev/fd\n" .
"/usr/local/libexec/spamlogd &\n" .
- "/usr/local/libexec/spamd {$passtime}{$identifier}{$greylisting}{$maxcon}{$maxblack}{$window} -b 127.0.0.1 &\n" .
+ "/usr/local/libexec/spamd {$passtime}{$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" .
@@ -85,8 +87,6 @@ function sync_package_spamd() {
);
conf_mount_ro();
config_unlock();
- stop_service("spamd");
- sleep(3);
start_service("spamd");
}
diff --git a/packages/spamd_settings.xml b/packages/spamd_settings.xml
index b7c3a1de..4e9fb0ab 100644
--- a/packages/spamd_settings.xml
+++ b/packages/spamd_settings.xml
@@ -91,6 +91,19 @@
<description>Set the socket receive buffer to this many bytes, adjusting the window size.</description>
<type>input</type>
<value></value>
+ </field>
+ <field>
+ <fielddescr>Reply SMTP error</fielddescr>
+ <fieldname>replysmtperror</fieldname>
+ <description>The SMTP error to return to the spammer, i.e. 450, 451, 550. This defaults to 450.</description>
+ <type>select</type>
+ <value>450</value>
+ <size>1</size>
+ <options>
+ <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>
<fielddescr>NextMTA</fielddescr>