diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-11-25 14:19:04 -0800 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-11-25 14:19:04 -0800 |
| commit | 85dbcc4822182bc3b2fb348b6da8493be60dbffb (patch) | |
| tree | 4d6c94f114b1a1e3dfc8d5ff4e6c28326686c130 | |
| parent | d22d24ca4cdfa93d5c04fda0331033f0d6a7f0e5 (diff) | |
| parent | bda563bbf7a7efd2f7b05ad209b4c000bdab3ea1 (diff) | |
| download | rspamd-85dbcc4822182bc3b2fb348b6da8493be60dbffb.tar.gz rspamd-85dbcc4822182bc3b2fb348b6da8493be60dbffb.zip | |
Merge pull request #5 from fatalbanana/master
Small fix for rbl.lua - properly check for empty source IP
| -rw-r--r-- | centos/rspamd.spec | 12 | ||||
| -rw-r--r-- | src/plugins/lua/rbl.lua | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/centos/rspamd.spec b/centos/rspamd.spec index 801d20939..9ecdfe50a 100644 --- a/centos/rspamd.spec +++ b/centos/rspamd.spec @@ -74,7 +74,6 @@ rm -rf %{buildroot} %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} %{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}.xml %{__install} -d -p -m 0755 %{buildroot}%{rspamd_logdir} %{__install} -o %{rspamd_user} -g %{rspamd_group} -d -p -m 0755 %{buildroot}%{rspamd_home} @@ -106,6 +105,13 @@ fi %{_bindir}/rspamd %{_bindir}/rspamc %config(noreplace) %{rspamd_confdir}/%{name}.conf +%config(noreplace) %{rspamd_confdir}/composites.conf +%config(noreplace) %{rspamd_confdir}/logging.conf +%config(noreplace) %{rspamd_confdir}/metrics.conf +%config(noreplace) %{rspamd_confdir}/modules.conf +%config(noreplace) %{rspamd_confdir}/options.conf +%config(noreplace) %{rspamd_confdir}/statistic.conf +%config(noreplace) %{rspamd_confdir}/workers.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %{rspamd_logdir} %dir %{rspamd_confdir} @@ -131,10 +137,10 @@ fi %config(noreplace) %{rspamd_confdir}/lua/rspamd.classifiers.lua %changelog -* Tue November 19 2013 Vsevolod Stakhov <vsevolod-at-highsecure.ru> 0.6.0-1 +* Tue Nov 19 2013 Vsevolod Stakhov <vsevolod-at-highsecure.ru> 0.6.0-1 - Update to 0.6.0. -* Mon June 10 2013 Vsevolod Stakhov <vsevolod-at-highsecure.ru> 0.5.6-1 +* Mon Jun 10 2013 Vsevolod Stakhov <vsevolod-at-highsecure.ru> 0.5.6-1 - Update to 0.5.6. * Sat May 25 2013 Vsevolod Stakhov <vsevolod-at-highsecure.ru> 0.5.5-1 diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua index d46e0a33d..86dba9900 100644 --- a/src/plugins/lua/rbl.lua +++ b/src/plugins/lua/rbl.lua @@ -78,7 +78,7 @@ local function rbl_cb (task) end local rip = task:get_from_ip() - if(rip ~= "0.0.0.0") then + if(rip:to_string() ~= "0.0.0.0") then for k,rbl in pairs(rbls) do if (rip:get_version() == 6 and rbl['ipv6'] and rbl['from']) or (rip:get_version() == 4 and rbl['ipv4'] and rbl['from']) then |