Compile with -DDISABLE_IMAP_ACL to build a Citadel server

without the IMAP ACL extension.

diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c
index 46b2053978c2c1fde4a9efccdf8d04f07b2ef478..4d5feb063ec62c139ccd07b76141c166b94e2296 100644 (file)
--- a/citadel/modules/imap/serv_imap.c
+++ b/citadel/modules/imap/serv_imap.c
@@ -435,12 +435,16 @@ void imap_cleanup_function(void)
  * output this stuff in other places as well)
  */
 void imap_output_capability_string(void) {
-       cprintf("CAPABILITY IMAP4REV1 NAMESPACE ID ACL AUTH=PLAIN AUTH=LOGIN");
+       cprintf("CAPABILITY IMAP4REV1 NAMESPACE ID AUTH=PLAIN AUTH=LOGIN");
 
 #ifdef HAVE_OPENSSL
        if (!CC->redirect_ssl) cprintf(" STARTTLS");
 #endif
 
+#ifndef DISABLE_IMAP_ACL
+       cprintf(" ACL");
+#endif
+
        /* We are building a partial implementation of METADATA for the sole purpose
         * of interoperating with the ical/vcard version of the Bynari Insight Connector.
         * If you were expecting something else, comment out one or both of these