From b09b314c3a8d1587bcb30b94941241c5c33aba0c Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Thu, 17 Jun 2010 14:27:34 +0000 Subject: [PATCH] Merge trunk rev. 5016 - allow the sender to be empty. --- changelog | 2 ++ patches/30-empty-sender.patch | 22 ++++++++++++++++++++++ patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 patches/30-empty-sender.patch diff --git a/changelog b/changelog index 770ff7b..cb61843 100644 --- a/changelog +++ b/changelog @@ -14,6 +14,8 @@ dma (0.0.2009.08.29-1) UNRELEASED; urgency=low - add the 28-valid-recipient patch to fix parsing recipients out of the message body - add the 29-double-free patch to fix a double-free error + - add the 30-empty-sender patch to allow an empty Sender field in + the Q* spool file - refresh 01-debian-build, 03-debian-locations, 04-debian-setgid, 09-typos, 10-liblockfile, 11-double-bounce, 17-mailname, 23-dirent-d_type, 24-random-message-id, and 25-unsupported-starttls diff --git a/patches/30-empty-sender.patch b/patches/30-empty-sender.patch new file mode 100644 index 0000000..a514856 --- /dev/null +++ b/patches/30-empty-sender.patch @@ -0,0 +1,22 @@ +Description: Allow an empty queue file field - only if it is the sender. + I'll forward this patch as soon as I catch up with the dma upstream. +Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/ +Forwarded: no +Author: Peter Pentchev +Last-Update: 2010-06-17 + +--- a/spool.c ++++ b/spool.c +@@ -171,9 +171,11 @@ + s++; + while (isspace(*s)) + s++; ++ if (s[0] == 0 && strcmp(line, "Sender") != 0) ++ goto malformed; + + s = strdup(s); +- if (s == NULL || s[0] == 0) ++ if (s == NULL) + goto malformed; + + if (strcmp(line, "ID") == 0) { diff --git a/patches/series b/patches/series index d331864..61130ed 100644 --- a/patches/series +++ b/patches/series @@ -13,3 +13,4 @@ 27-int-size.patch 28-valid-recipient.patch 29-double-free.patch +30-empty-sender.patch -- 2.47.3