Merge trunk rev. 5016 - allow the sender to be empty.

diff --git a/changelog b/changelog
index 770ff7b86dfc4dee81eb6ab962a2fcfd25b662b2..cb61843acd4c0095bb6f68a80160c1816d375916 100644 (file)
--- 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 (file)
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 <roam@ringlet.net>
+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 d33186412661a9f518381bce0810a0b2f6e0577a..61130ed3fa7d9b839e8e996f42205f6ed802162d 100644 (file)
--- 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