lib-sieve: Properly implemented checking of ABI version for plugins.

configure.ac

 AC_INIT([Pigeonhole], [0.4.8], [dovecot@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])

pigeonhole-config.h.in

@@ -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
 

src/lib-sieve/sieve-plugins.c

@@ -77,7 +77,7 @@ void sieve_plugins_load
 		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;
 

src/lib-sieve/storage/ldap/sieve-ldap-storage.c

@@ -184,6 +184,8 @@ const struct sieve_storage sieve_ldap_storage_plugin = {
 #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

src/plugins/sieve-extprograms/sieve-extprograms-plugin.c

@@ -18,6 +18,8 @@ struct _plugin_context {
 	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)
 {