dovecot-2.2-pigeonhole: lib-sieve: Properly implemented checking...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/49ac5b0000fd
changeset: 2084:49ac5b0000fd
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Thu Aug 06 22:23:03 2015 +0200
description:
lib-sieve: Properly implemented checking of ABI version for plugins.

diffstat:

 configure.ac                                             |  2 ++
 pigeonhole-config.h.in                                   |  3 +++
 src/lib-sieve/sieve-plugins.c                            |  2 +-
 src/lib-sieve/storage/ldap/sieve-ldap-storage.c          |  2 ++
 src/plugins/sieve-extprograms/sieve-extprograms-plugin.c |  2 ++
 5 files changed, 10 insertions(+), 1 deletions(-)

diffs (59 lines):

diff -r f8374f7c6e92 -r 49ac5b0000fd configure.ac
--- a/configure.ac	Sat Jul 25 00:53:51 2015 +0200
+++ b/configure.ac	Thu Aug 06 22:23:03 2015 +0200
@@ -1,4 +1,6 @@
 AC_INIT([Pigeonhole], [0.4.8], [dovecot at dovecot.org], [dovecot-2.2-pigeonhole])
+AC_DEFINE_UNQUOTED([PIGEONHOLE_ABI_VERSION], "0.4.ABIv1($PACKAGE_VERSION)", [Pigeonhole ABI version])
+
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_MACRO_DIR([m4])
diff -r f8374f7c6e92 -r 49ac5b0000fd pigeonhole-config.h.in
--- a/pigeonhole-config.h.in	Sat Jul 25 00:53:51 2015 +0200
+++ b/pigeonhole-config.h.in	Thu Aug 06 22:23:03 2015 +0200
@@ -5,6 +5,9 @@
 /* Define to the version of Pigeonhole for Dovecot. */
 #undef PIGEONHOLE_VERSION
 
+/* Pigeonhole ABI version */
+#undef PIGEONHOLE_ABI_VERSION
+
 /* Define to build unfinished features/extensions. */
 #undef HAVE_SIEVE_UNFINISHED
 
diff -r f8374f7c6e92 -r 49ac5b0000fd src/lib-sieve/sieve-plugins.c
--- a/src/lib-sieve/sieve-plugins.c	Sat Jul 25 00:53:51 2015 +0200
+++ b/src/lib-sieve/sieve-plugins.c	Thu Aug 06 22:23:03 2015 +0200
@@ -77,7 +77,7 @@
 		path = MODULEDIR"/sieve";
 
 	memset(&mod_set, 0, sizeof(mod_set));
-	mod_set.abi_version = PIGEONHOLE_VERSION;
+	mod_set.abi_version = PIGEONHOLE_ABI_VERSION;
 	mod_set.require_init_funcs = TRUE;
 	mod_set.debug = FALSE;
 
diff -r f8374f7c6e92 -r 49ac5b0000fd src/lib-sieve/storage/ldap/sieve-ldap-storage.c
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c	Sat Jul 25 00:53:51 2015 +0200
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c	Thu Aug 06 22:23:03 2015 +0200
@@ -184,6 +184,8 @@
 #ifndef SIEVE_BUILTIN_LDAP
 /* Building a plugin */
 
+const char *sieve_storage_ldap_plugin_version = PIGEONHOLE_ABI_VERSION;
+
 void sieve_storage_ldap_plugin_load
 (struct sieve_instance *svinst, void **context);
 void sieve_storage_ldap_plugin_unload
diff -r f8374f7c6e92 -r 49ac5b0000fd src/plugins/sieve-extprograms/sieve-extprograms-plugin.c
--- a/src/plugins/sieve-extprograms/sieve-extprograms-plugin.c	Sat Jul 25 00:53:51 2015 +0200
+++ b/src/plugins/sieve-extprograms/sieve-extprograms-plugin.c	Thu Aug 06 22:23:03 2015 +0200
@@ -18,6 +18,8 @@
 	const struct sieve_extension *ext_execute;		
 };
 
+const char *sieve_extprograms_plugin_version = PIGEONHOLE_ABI_VERSION;
+
 void sieve_extprograms_plugin_load
 (struct sieve_instance *svinst, void **context)
 {