Merge branches/debian/ rev. 4976: validate parsed recipient addresses.

diff --git a/changelog b/changelog
index 5f58064fc2a7cc2f41216271dceb9cb578746396..450a95d19b431a3aee0ab36535264a20794715fc 100644 (file)
--- a/changelog
+++ b/changelog
@@ -11,6 +11,8 @@ dma (0.0.2009.08.29-1) UNRELEASED; urgency=low
     - add the 26-getprogname patch to use program_invocation_short_name()
       instead of getprogname() on GNU systems
     - add the 27-int-size patch to cast a variable to the correct type
+    - add the 28-valid-recipient patch to fix parsing recipients out of
+      the message body
     - 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/28-valid-recipient.patch b/patches/28-valid-recipient.patch
new file mode 100644 (file)
index 0000000..6d8fc19
--- /dev/null
+++ b/patches/28-valid-recipient.patch
@@ -0,0 +1,20 @@
+Description: Check the parsed recipient address for validity.
+ I'll forward this patch when 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-15
+
+--- a/mail.c
++++ b/mail.c
+@@ -428,8 +428,8 @@
+       if (addr == NULL)
+               errlog(1, NULL);
+ 
+-      add_recp(queue, addr, 1);
+-      fprintf(stderr, "parsed `%s'\n", addr);
++      if (add_recp(queue, addr, 1) != 0)
++              errlogx(1, "invalid recipient `%s'", addr);
+       goto again;
+ }
+ 

diff --git a/patches/series b/patches/series
index 7d3d40813824c3e1684117ca0ace4c938b2eaf1e..e60f17d796bdf174a846204a0231398f43a5110a 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -11,3 +11,4 @@
 25-unsupported-starttls.patch
 26-getprogname.patch
 27-int-size.patch
+28-valid-recipient.patch