diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-04-17 23:04:45 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-04-17 23:04:45 +0000 |
| commit | ae7181a14ad66a20c2c16ec57d4e25653893bcad (patch) | |
| tree | 40cbb260ff0f2dcbab252a697c0d8d0ba9a36ff7 | |
| parent | c2e3e599859ad1a232e98b4708c1fb62b5043ea4 (diff) | |
| download | pfsense-packages-ae7181a14ad66a20c2c16ec57d4e25653893bcad.tar.gz pfsense-packages-ae7181a14ad66a20c2c16ec57d4e25653893bcad.tar.bz2 pfsense-packages-ae7181a14ad66a20c2c16ec57d4e25653893bcad.zip | |
From the newer man page:
Previous versions of spamd required traps to be entered into the database
including the enclosing <> characters; current versions expect only the
email address without the enclosing <> characters.
| -rw-r--r-- | packages/spamd_db.php | 6 | ||||
| -rw-r--r-- | packages/spamd_db_ext.php | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/packages/spamd_db.php b/packages/spamd_db.php index a9a76032..cbaa27bd 100644 --- a/packages/spamd_db.php +++ b/packages/spamd_db.php @@ -91,7 +91,7 @@ if($_GET['action'] or $_POST['action']) { /* spam trap e-mail address */ if($_POST['spamtrapemail'] <> "") { - mwexec("/usr/local/sbin/spamdb -T -a \"<{$_POST['spamtrapemail']}>\""); + mwexec("/usr/local/sbin/spamdb -T -a \"{$_POST['spamtrapemail']}\""); mwexec("killall -HUP spamlogd"); $savemsg = $_POST['spamtrapemail'] . " added to spam trap database."; } @@ -114,7 +114,7 @@ if($_GET['getstatus'] <> "") { /* spam trap e-mail address */ if($_GET['spamtrapemail'] <> "") { - $status = exec("spamdb -T -a \"<{$_GET['spamtrapemail']}>\""); + $status = exec("spamdb -T -a \"{$_GET['spamtrapemail']}\""); mwexec("killall -HUP spamlogd"); if($status) echo $status; @@ -125,7 +125,7 @@ if($_GET['spamtrapemail'] <> "") { /* spam trap e-mail address */ if($_GET['whitelist'] <> "") { - $status = exec("spamdb -a \"<{$_GET['spamtrapemail']}>\""); + $status = exec("spamdb -a \"{$_GET['spamtrapemail']}\""); mwexec("killall -HUP spamlogd"); if($status) echo $status; diff --git a/packages/spamd_db_ext.php b/packages/spamd_db_ext.php index 85aa3c68..71bbd41f 100644 --- a/packages/spamd_db_ext.php +++ b/packages/spamd_db_ext.php @@ -91,7 +91,7 @@ if($_GET['action'] or $_POST['action']) { delete_from_spamd_db($email); delete_from_whitelist($srcip); usleep(100); - exec("/usr/local/sbin/spamdb -a \"<{$email}>\" -T"); + exec("/usr/local/sbin/spamdb -a \"{$email}\" -T"); hup_spamd(); mwexec("/sbin/pfctl -q -t blacklist -T add -f /var/db/blacklist.txt"); log_error("spamd: {$srcip} has been blacklisted by {$_SERVER['REMOTE_ADDR']} {$loginname}"); @@ -114,9 +114,9 @@ if($_GET['action'] or $_POST['action']) { /* spam trap e-mail address */ if($_POST['spamtrapemail'] <> "") { exec("/usr/local/sbin/spamdb -d {$_POST['spamtrapemail']}"); - exec("/usr/local/sbin/spamdb -d -T \"<{$_POST['spamtrapemail']}>\""); - exec("/usr/local/sbin/spamdb -d -t \"<{$_POST['spamtrapemail']}>\""); - mwexec("/usr/local/sbin/spamdb -T -a \"<{$_POST['spamtrapemail']}>\""); + exec("/usr/local/sbin/spamdb -d -T \"{$_POST['spamtrapemail']}\""); + exec("/usr/local/sbin/spamdb -d -t \"{$_POST['spamtrapemail']}\""); + mwexec("/usr/local/sbin/spamdb -T -a \"{$_POST['spamtrapemail']}\""); mwexec("killall -HUP spamlogd"); $savemsg = $_POST['spamtrapemail'] . " added to spam trap database."; } @@ -139,7 +139,7 @@ if($_GET['getstatus'] <> "") { /* spam trap e-mail address */ if($_GET['spamtrapemail'] <> "") { - $status = exec("spamdb -T -a \"<{$_GET['spamtrapemail']}>\""); + $status = exec("spamdb -T -a \"{$_GET['spamtrapemail']}\""); mwexec("killall -HUP spamlogd"); if($status) echo $status; @@ -150,7 +150,7 @@ if($_GET['spamtrapemail'] <> "") { /* spam trap e-mail address */ if($_GET['whitelist'] <> "") { - $status = exec("spamdb -a \"<{$_GET['spamtrapemail']}>\""); + $status = exec("spamdb -a \"{$_GET['spamtrapemail']}\""); mwexec("killall -HUP spamlogd"); if($status) echo $status; |