From: Walter Doekes <walter+asterisk@wjd.nu>
Date: Sun, 12 Oct 2014 07:43:12 +0000 (+0000)
Subject: res_calendar_ews: Relax neon version check to work with 0.30 too.
X-Git-Tag: 12.7.0-rc1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=020b0432c187bf0239606c4ad183e01fcb6cd2d5;p=thirdparty%2Fasterisk.git

res_calendar_ews: Relax neon version check to work with 0.30 too.

Allow res_calendar_ews to work not only with libneon-0.29 but also
with 0.30.

ASTERISK-24325 #close
Reported by: Tzafrir Cohen

Review: https://reviewboard.asterisk.org/r/4068/
........

Merged revisions 425286 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 425287 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@425288 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_calendar_ews.c b/res/res_calendar_ews.c
index fe8c8a7bb5..8fc77bf9dc 100644
--- a/res/res_calendar_ews.c
+++ b/res/res_calendar_ews.c
@@ -907,8 +907,17 @@ static void *ewscal_load_calendar(void *void_data)
 static int load_module(void)
 {
 	/* Actualy, 0.29.1 is required (because of NTLM authentication), but this
-	 * function does not support matching patch version. */
-	if (ne_version_match(0, 29)) {
+	 * function does not support matching patch version.
+	 *
+	 * The ne_version_match function returns non-zero if the library
+	 * version is not of major version major, or the minor version
+	 * is less than minor. For neon versions 0.x, every minor
+	 * version is assumed to be incompatible with every other minor
+	 * version.
+	 *
+	 * I.e. for version 1.2..1.9 we would do ne_version_match(1, 2)
+	 * but for version 0.29 and 0.30 we need two checks. */
+	if (ne_version_match(0, 29) && ne_version_match(0, 30)) {
 		ast_log(LOG_ERROR, "Exchange Web Service calendar module require neon >= 0.29.1, but %s is installed.\n", ne_version_string());
 		return AST_MODULE_LOAD_DECLINE;
 	}