summaryrefslogtreecommitdiffstats
path: root/imap
diff options
context:
space:
mode:
authorSam Varshavchik2021-03-25 07:18:07 -0400
committerSam Varshavchik2021-03-25 07:18:45 -0400
commita05446f16401d6ae3c93247c3643f529f2672104 (patch)
treebb0c61ea5966649d1d7bb5e84804e2e6417e5533 /imap
parent5c5087a2d7c404538826bb7b4e36a7eeaf73bd67 (diff)
downloadcourier-libs-a05446f16401d6ae3c93247c3643f529f2672104.tar.bz2
Fix makedat handling of files without a trailing newline, adjust imap errmsg.
Diffstat (limited to 'imap')
-rw-r--r--imap/ChangeLog7
-rw-r--r--imap/imapd.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/imap/ChangeLog b/imap/ChangeLog
index 463d4ae..c5f3f62 100644
--- a/imap/ChangeLog
+++ b/imap/ChangeLog
@@ -1,3 +1,10 @@
+2021-03-25 Sam Varshavchik <mrsam@courier-mta.com>
+
+ * make*: Individual files that did not end in a newline were
+ not handled correctly.
+
+ * imap: adjust error message.
+
5.1.1
2021-03-20 Arjen de Korte <build+github@de-korte.org>
diff --git a/imap/imapd.c b/imap/imapd.c
index f2f4bbd..8c2723b 100644
--- a/imap/imapd.c
+++ b/imap/imapd.c
@@ -4318,8 +4318,6 @@ int uid=0;
}
if (strcmp(curtoken->tokenbuf, "IDLE") == 0)
{
- const char *p;
-
if (nexttoken()->tokentype != IT_EOL) return (-1);
read_eol();
@@ -6967,7 +6965,7 @@ int main(int argc, char **argv)
if ((w=maildirwatch_alloc(".")) == NULL)
{
- writes("* OK [ALERT] Filesystem notification initialization error -- contact your mail administrator (check for configuration errors with the FAM/Gamin library)\r\n");
+ writes("* OK [ALERT] Inotify initialization error\r\n");
}
else
{