[asterisk-commits] wdoekes: branch 12 r425288 - in /branches/12: ./ res/res_calendar_ews.c

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Sun Oct 12 02:43:12 2014
New Revision: 425288

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425288
Log:
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

Modified:
    branches/12/   (props changed)
    branches/12/res/res_calendar_ews.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/res/res_calendar_ews.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_calendar_ews.c?view=diff&rev=425288&r1=425287&r2=425288
==============================================================================
--- branches/12/res/res_calendar_ews.c (original)
+++ branches/12/res/res_calendar_ews.c Sun Oct 12 02:43:12 2014
@@ -907,8 +907,17 @@
 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;
 	}