diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-01-28 22:39:49 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-01-28 22:39:49 +0000 |
| commit | ec5738fa79e4b87d4474e2b8e719740226abfb42 (patch) | |
| tree | ac3d1c288bf64abadaf3fd7ee1e2d1b9d0afaa05 /packages/spamd.inc | |
| parent | ced114fa6168eee63e7055f898453d311cc67a50 (diff) | |
| download | pfsense-packages-ec5738fa79e4b87d4474e2b8e719740226abfb42.tar.gz pfsense-packages-ec5738fa79e4b87d4474e2b8e719740226abfb42.tar.bz2 pfsense-packages-ec5738fa79e4b87d4474e2b8e719740226abfb42.zip | |
Use correct variable for SpamD greylisting parms
Diffstat (limited to 'packages/spamd.inc')
| -rw-r--r-- | packages/spamd.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/spamd.inc b/packages/spamd.inc index a57e1bb0..7d46c6fa 100644 --- a/packages/spamd.inc +++ b/packages/spamd.inc @@ -50,12 +50,12 @@ function sync_package_spamd() { foreach($config['installedpackages']['spamdsettings']['config'] as $ss) { if($ss['nextmta'] <> "") $nextmta = $ss['nextmta']; - if($ss['passtime'] <> "") - $passtime = $ss['passtime']; + if($ss['greylistingparms'] <> "") + $passtime = " -G " . $ss['greylistingparms']; if($ss['identifier'] <> "") $identifier = " -n \"" . $ss['identifier'] . "\""; if(isset($ss['greylisting']) <> "") - $greylisting = $ss['greylisting']; + $greylisting = " -g"; if($ss['maxblack'] <> "") $maxblack = " -B " . $ss['maxblack']; if($ss['maxcon'] <> "") @@ -70,7 +70,8 @@ function sync_package_spamd() { "/sbin/pflogd &\n" . "/sbin/mount_fdescfs fdescfs /dev/fd\n" . "/usr/local/libexec/spamlogd &\n" . - "/usr/local/libexec/spamd -G {$passtime}{$identifier}{$greylisting}{$maxcon}{$maxblack} -b 127.0.0.1 &\n" . + "/usr/local/libexec/spamd {$passtime}{$identifier}{$greylisting}{$maxcon}{$maxblack} -b 127.0.0.1 &\n" . + "/usr/local/libexec/spamlogd &\n" . "sleep 1\n"; $stop = "/usr/bin/killall spamd-setup\n" . "/usr/bin/killall spamd\n" . |