Skip to content
Snippets Groups Projects
Commit e136c32a authored by dgoulet's avatar dgoulet
Browse files

Support dovecot 2.3


Untested but it builds now properly. Thanks to "smorks" for the report!

Fixes #16

Signed-off-by: default avatarDavid Goulet <dgoulet@ev0ke.net>
parent e54c717b
Branches
No related tags found
No related merge requests found
...@@ -431,5 +431,9 @@ trees_istream_create(struct istream *input, ...@@ -431,5 +431,9 @@ trees_istream_create(struct istream *input,
sstream->out_byte_count = 0; sstream->out_byte_count = 0;
#endif #endif
#if DOVECOT_PREREQ(2, 3)
return i_stream_create(&sstream->istream, input, i_stream_get_fd(input), 0);
#else
return i_stream_create(&sstream->istream, input, i_stream_get_fd(input)); return i_stream_create(&sstream->istream, input, i_stream_get_fd(input));
#endif /* DOVECOT_PREREQ */
} }
...@@ -174,7 +174,14 @@ trees_ostream_sendv(struct ostream_private *stream, ...@@ -174,7 +174,14 @@ trees_ostream_sendv(struct ostream_private *stream,
static int static int
trees_ostream_flush(struct ostream_private *stream) trees_ostream_flush(struct ostream_private *stream)
{ {
/* This is pretty ugly but unfortunately between 2.2 and 2.3, Dovecot changed
* the expected value to be non zero in 2.3+ . */
#if DOVECOT_PREREQ(2, 3)
ssize_t result = 1;
#else
ssize_t result = 0; ssize_t result = 0;
#endif /* DOVECOT_PREREQ */
struct trees_ostream *sstream = (struct trees_ostream *) stream; struct trees_ostream *sstream = (struct trees_ostream *) stream;
if (sstream->flushed) { if (sstream->flushed) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment