From: Vsevolod Stakhov Date: Tue, 8 Mar 2016 16:01:15 +0000 (+0000) Subject: [Fix] Fix versions comparison X-Git-Tag: 1.2.0~94 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=217cc21be61bb2bdd3e9b584137e7555630c7420;p=thirdparty%2Frspamd.git [Fix] Fix versions comparison --- diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c index 497e5cf9be..265b14ca4e 100644 --- a/src/libserver/cfg_rcl.c +++ b/src/libserver/cfg_rcl.c @@ -728,7 +728,7 @@ rspamd_rcl_lua_version_cmp (lua_State *L) } if (components[1]) { - ret = rspamd_rcl_cmp_components (components[1], RSPAMD_VERSION_MAJOR); + ret = rspamd_rcl_cmp_components (components[1], RSPAMD_VERSION_MINOR); } if (ret) { diff --git a/src/plugins/lua/rspamd_update.lua b/src/plugins/lua/rspamd_update.lua index 14f9e54b74..344f58ebee 100644 --- a/src/plugins/lua/rspamd_update.lua +++ b/src/plugins/lua/rspamd_update.lua @@ -60,14 +60,14 @@ local function check_version(obj) local ret = true if obj['min_version'] then - if rspamd_version('cmp', obj['min_version']) < 0 then + if rspamd_version('cmp', obj['min_version']) > 0 then ret = false rspamd_logger.errx(rspamd_config, 'updates require at least %s version of rspamd', obj['min_version']) end end if obj['max_version'] then - if rspamd_version('cmp', obj['max_version']) > 0 then + if rspamd_version('cmp', obj['max_version']) < 0 then ret = false rspamd_logger.errx(rspamd_config, 'updates require maximum %s version of rspamd', obj['max_version'])