From eaa9814bada77fa013465d9bcaee83be82357cbf Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 9 Jul 2014 16:12:31 -0700
Subject: [PATCH] Split addresses by ; as well as ,
 http://virtualmin.com/node/33664

---
 mailboxes/boxes-lib.pl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mailboxes/boxes-lib.pl b/mailboxes/boxes-lib.pl
index d11620d64..cb41f34d3 100755
--- a/mailboxes/boxes-lib.pl
+++ b/mailboxes/boxes-lib.pl
@@ -1793,17 +1793,17 @@ sub split_addresses
 local (@rv, $str = $_[0]);
 while(1) {
 	$str =~ s/\\"/\0/g;
-	if ($str =~ /^[\s,]*(([^<>\(\)\s"]+)\s+\(([^\(\)]+)\))(.*)$/) {
+	if ($str =~ /^[\s,;]*(([^<>\(\)\s"]+)\s+\(([^\(\)]+)\))(.*)$/) {
 		# An address like  foo@bar.com (Fooey Bar)
 		push(@rv, [ $2, $3, $1 ]);
 		$str = $4;
 		}
-	elsif ($str =~ /^[\s,]*("([^"]+)"\s*<([^\s<>,]+)>)(.*)$/ ||
-	       $str =~ /^[\s,]*(([^<>\@]+)\s+<([^\s<>,]+)>)(.*)$/ ||
-	       $str =~ /^[\s,]*(([^<>\@]+)<([^\s<>,]+)>)(.*)$/ ||
-	       $str =~ /^[\s,]*(([^<>\[\]]+)\s+\[mailto:([^\s\[\]]+)\])(.*)$/||
-	       $str =~ /^[\s,]*(()<([^<>,]+)>)(.*)/ ||
-	       $str =~ /^[\s,]*(()([^\s<>,]+))(.*)/) {
+	elsif ($str =~ /^[\s,;]*("([^"]+)"\s*<([^\s<>,]+)>)(.*)$/ ||
+	       $str =~ /^[\s,;]*(([^<>\@]+)\s+<([^\s<>,]+)>)(.*)$/ ||
+	       $str =~ /^[\s,;]*(([^<>\@]+)<([^\s<>,]+)>)(.*)$/ ||
+	       $str =~ /^[\s,;]*(([^<>\[\]]+)\s+\[mailto:([^\s\[\]]+)\])(.*)$/||
+	       $str =~ /^[\s,;]*(()<([^<>,]+)>)(.*)/ ||
+	       $str =~ /^[\s,;]*(()([^\s<>,;]+))(.*)/) {
 		# Addresses like  "Fooey Bar" <foo@bar.com>
 		#                 Fooey Bar <foo@bar.com>
 		#                 Fooey Bar<foo@bar.com>