dovecot-2.2-pigeonhole: lib-sieve: ldap storage: Fixed --with-ld...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Mon Jul 28 07:28:09 UTC 2014
details: http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/5117ffc8b151
changeset: 1896:5117ffc8b151
user: Stephan Bosch <stephan at rename-it.nl>
date: Mon Jul 28 09:27:59 2014 +0200
description:
lib-sieve: ldap storage: Fixed --with-ldap=no compile.
diffstat:
src/lib-sieve/storage/ldap/sieve-ldap-db.c | 1 -
src/lib-sieve/storage/ldap/sieve-ldap-storage.c | 6 ++++++
src/lib-sieve/storage/ldap/sieve-ldap-storage.h | 10 ++++++----
3 files changed, 12 insertions(+), 5 deletions(-)
diffs (55 lines):
diff -r 1475892e8cff -r 5117ffc8b151 src/lib-sieve/storage/ldap/sieve-ldap-db.c
--- a/src/lib-sieve/storage/ldap/sieve-ldap-db.c Sat Jul 26 01:17:51 2014 +0200
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-db.c Mon Jul 28 09:27:59 2014 +0200
@@ -6,7 +6,6 @@
#include "sieve-common.h"
#include "sieve-ldap-storage.h"
-#include "sieve-ldap-db.h"
/* FIXME: Imported this from Dovecot auth for now. We're working on a proper
lib-ldap, but, until then, some code is duplicated here. */
diff -r 1475892e8cff -r 5117ffc8b151 src/lib-sieve/storage/ldap/sieve-ldap-storage.c
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c Sat Jul 26 01:17:51 2014 +0200
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c Mon Jul 28 09:27:59 2014 +0200
@@ -12,6 +12,12 @@
#include "sieve-error.h"
+#ifndef PLUGIN_BUILD
+const struct sieve_storage sieve_ldap_storage;
+#else
+const struct sieve_storage sieve_ldap_storage_plugin;
+#endif
+
/*
* Storage class
*/
diff -r 1475892e8cff -r 5117ffc8b151 src/lib-sieve/storage/ldap/sieve-ldap-storage.h
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage.h Sat Jul 26 01:17:51 2014 +0200
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage.h Mon Jul 28 09:27:59 2014 +0200
@@ -8,14 +8,14 @@
#include "sieve-script-private.h"
#include "sieve-storage-private.h"
+#define SIEVE_LDAP_SCRIPT_DEFAULT "default"
+
+#if defined(SIEVE_BUILTIN_LDAP) || defined(PLUGIN_BUILD)
+
#include "sieve-ldap-db.h"
struct sieve_ldap_storage;
-#define SIEVE_LDAP_SCRIPT_DEFAULT "default"
-
-extern const struct sieve_storage sieve_ldap_storage_plugin;
-
/*
* LDAP settings
*/
@@ -106,3 +106,5 @@
void sieve_ldap_script_sequence_destroy(struct sieve_script_sequence *seq);
#endif
+
+#endif
More information about the dovecot-cvs
mailing list