File 0008-Extend-ifdefs-endifs-for-WITH_DAV.patch of Package cyrus-imapd

File 0008-Extend-ifdefs-endifs-for-WITH_DAV.patch of Package cyrus-imapd (Revision 52)

Currently displaying revision 52 , Show latest

From 46eb1fa3ba446dbfdb31277fb0499785394a4d72 Mon Sep 17 00:00:00 2001
From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
Date: Sun, 9 Mar 2014 00:00:30 +0100
Subject: [PATCH 8/8] Extend ifdefs/endifs for WITH_DAV

---
 imap/mbdump.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/imap/mbdump.c b/imap/mbdump.c
index acabb95..352ed24 100644
--- a/imap/mbdump.c
+++ b/imap/mbdump.c
@@ -630,6 +630,7 @@ EXPORTED int dump_mailbox(const char *tag, struct mailbox *mailbox, uint32_t uid
 		fname = mboxkey_getpath(userid);
 		ftag = "MBOXKEY";
 		break;
+#ifdef WITH_DAV
 	    case DAV_DB: {
 		struct buf dav_file = BUF_INITIALIZER;
 
@@ -638,6 +639,7 @@ EXPORTED int dump_mailbox(const char *tag, struct mailbox *mailbox, uint32_t uid
 		ftag = "DAV";
 		break;
 	    }
+#endif // WITH_DAV
 	    default:
 		fatal("unknown user data file", EC_OSFILE);
 	    }
@@ -1072,12 +1074,14 @@ EXPORTED int undump_mailbox(const char *mbname,
 	    char *s = user_hash_subs(userid);
 	    strlcpy(fnamebuf, s, sizeof(fnamebuf));
 	    free(s);
+#ifdef WITHDAV
 	} else if (userid && !strcmp(file.s, "DAV")) {
 	    /* overwriting this outright is absolutely what we want to do */
 	    struct buf dav_file = BUF_INITIALIZER;
 	    dav_getpath_byuserid(&dav_file, userid);
 	    strlcpy(fnamebuf, buf_cstring(&dav_file), sizeof(fnamebuf));
 	    buf_free(&dav_file);
+#endif // WITH_DAV
 	} else if (userid && !strcmp(file.s, "SEEN")) {
 	    seen_file = seen_getpath(userid);
 
-- 
1.8.3.1