summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Varshavchik2016-08-03 21:26:39 -0400
committerSam Varshavchik2016-08-03 21:26:39 -0400
commitd9272fd67385fb8499f64c4a1b32daeb1fdfc57b (patch)
tree302600e072cf5602bf3dc30a3468573e39e798cb
parent2749cda3586d7714b823f3e9519d931187610a63 (diff)
parente15f9ad454ceed6208ef134442a0ddbbe1d8c6a0 (diff)
downloadcourier-libs-d9272fd67385fb8499f64c4a1b32daeb1fdfc57b.tar.bz2
Merge branch 'master' of monster:/home/var/www/gitrepos/courier-libs
-rw-r--r--imap/ChangeLog6
-rw-r--r--imap/configure.ac2
-rw-r--r--imap/imapd.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/imap/ChangeLog b/imap/ChangeLog
index 5c8d2ed..69e57c2 100644
--- a/imap/ChangeLog
+++ b/imap/ChangeLog
@@ -1,3 +1,9 @@
+4.17.2
+
+2016-08-03 Sam Varshavchik <mrsam@courier-mta.com>
+
+ * imapd.c (do_folder_delete): Fix check for DELETE INBOX.
+
4.17.1
2016-04-30 Sam Varshavchik <mrsam@courier-mta.com>
diff --git a/imap/configure.ac b/imap/configure.ac
index 4725ccc..1106e15 100644
--- a/imap/configure.ac
+++ b/imap/configure.ac
@@ -4,7 +4,7 @@ dnl
dnl Copyright 1998 - 2016 Double Precision, Inc. See COPYING for
dnl distribution information.
-AC_INIT(courier-imap, 4.17.1, [courier-users@lists.sourceforge.net])
+AC_INIT(courier-imap, 4.17.2, [courier-users@lists.sourceforge.net])
>confdefs.h # Kill PACKAGE_ macros
diff --git a/imap/imapd.c b/imap/imapd.c
index 0b00b3c..07fa057 100644
--- a/imap/imapd.c
+++ b/imap/imapd.c
@@ -3767,7 +3767,7 @@ int do_folder_delete(char *mailbox_name)
if (acl_read_folder(&l, mi.homedir, mi.maildir) < 0)
return -1;
- if (strcmp(mi.maildir, INBOX))
+ if (strcasecmp(mi.maildir, INBOX))
{
char *p=maildir_name2dir(mi.homedir, mi.maildir);