signature of dovecot mailbox_transaction_begin function changed for

dovecot 2.3.x

configure.ac

@@ -147,6 +147,13 @@ AC_CHECK_MEMBER([struct mail_storage_vfuncs.list_index_corrupted],
                           #include "mail-storage-private.h"
                           ]])
 
+
+AC_MSG_CHECKING([for HAVE_MAIL_STORAGE_TRANSACTION_OLD_SIGNATURE])
+AS_IF([$GREP -A 1 'mailbox_transaction_begin(struct mailbox \*box' $dovecot_pkgincludedir/mail-storage.h | grep 'enum mailbox_transaction_flags flags);'], [AC_MSG_RESULT(yes) AC_DEFINE([HAVE_MAIL_STORAGE_TRANSACTION_OLD_SIGNATURE],,[HAVE_MAIL_STORAGE_TRANSACTION_OLD_SIGNATURE supported])],[AC_MSG_RESULT(no)])
+
+
+
+
 AC_CONFIG_HEADERS([config-local.h])
 AX_PREFIX_CONFIG_H([$PACKAGE-config.h], [$PACKAGE], [config-local.h])
 

src/tests/storage-mock-rbox/test_storage_mock_rbox.cpp

@@ -33,6 +33,8 @@ extern "C" {
 
 #include "libdict-rados-plugin.h"
 }
+#include "dovecot-ceph-plugin-config.h"
+
 #include "rbox-storage.hpp"
 #include "../mocks/mock_test.h"
 
@@ -70,8 +72,13 @@ TEST_F(StorageTest, mail_save_to_inbox_storage_mock_no_rados_available) {
       "body\n";
 
   struct istream *input = i_stream_create_from_data(message, strlen(message));
-
+#ifdef DOVECOT_CEPH_PLUGIN_HAVE_MAIL_STORAGE_TRANSACTION_OLD_SIGNATURE
   struct mailbox_transaction_context *trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL);
+#else
+  char reason[256];
+  struct mailbox_transaction_context *trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL, reason);
+#endif
+
   struct mail_save_context *save_ctx = mailbox_save_alloc(trans);
 
   // set the Mock storage
@@ -146,7 +153,12 @@ TEST_F(StorageTest, exec_write_op_fails) {
 
   struct istream *input = i_stream_create_from_data(message, strlen(message));
 
+#ifdef DOVECOT_CEPH_PLUGIN_HAVE_MAIL_STORAGE_TRANSACTION_OLD_SIGNATURE
   struct mailbox_transaction_context *trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL);
+#else
+  char reason[256];
+  struct mailbox_transaction_context *trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL, reason);
+#endif
   struct mail_save_context *save_ctx = mailbox_save_alloc(trans);
 
   // set the Mock storage
@@ -224,7 +236,12 @@ TEST_F(StorageTest, write_op_fails) {
 
   struct istream *input = i_stream_create_from_data(message, strlen(message));
 
+#ifdef DOVECOT_CEPH_PLUGIN_HAVE_MAIL_STORAGE_TRANSACTION_OLD_SIGNATURE
   struct mailbox_transaction_context *trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL);
+#else
+  char reason[256];
+  struct mailbox_transaction_context *trans = mailbox_transaction_begin(box, MAILBOX_TRANSACTION_FLAG_EXTERNAL, reason);
+#endif
   struct mail_save_context *save_ctx = mailbox_save_alloc(trans);
 
   // set the Mock storage