smimea - Improve email address identification

raforg · raforg · commit 9fa65a83eefc · 2023-04-18T16:44:33.000+10:00
diff --git a/danectl b/danectl
@@ -1454,7 +1454,9 @@ smimea()
 		while (<>)
 		{
 			print("$1\n"), last if /emailAddress\s*=\s*(\S+)/;
+			print("$1\n"), last if /email\s*:\s*(\S+)/;
 			print("$1\n"), last if /SmtpUTF8Mailbox\s*:[^:]*:\s*(\S+)/;
+			print("$1\n"), last if /CN\s*=\s*(\S+@\S+)$/;
 		}
 		while (<>) {}
 	'`"
@@ -1504,8 +1506,10 @@ smimea_check()
 		use warnings;
 		while (<>)
 		{
-			print("$1\n"), last if /emailAddress = (\S+)/;
+			print("$1\n"), last if /emailAddress\s*=\s*(\S+)/;
+			print("$1\n"), last if /email\s*:\s*(\S+)/;
 			print("$1\n"), last if /SmtpUTF8Mailbox\s*:[^:]*:\s*(\S+)/;
+			print("$1\n"), last if /CN\s*=\s*(\S+@\S+)$/;
 		}
 		while (<>) {}
 	'`"

Original file line number	Diff line number	Diff line change
`@@ -1454,7 +1454,9 @@ smimea()`
`1454`	`1454`	`while (<>)`
`1455`	`1455`	`{`
`1456`	`1456`	`print("$1\n"), last if /emailAddress\s=\s(\S+)/;`
	`1457`	`+ print("$1\n"), last if /email\s:\s(\S+)/;`
`1457`	`1458`	`print("$1\n"), last if /SmtpUTF8Mailbox\s:[^:]:\s*(\S+)/;`
	`1459`	`+ print("$1\n"), last if /CN\s=\s(\S+@\S+)$/;`
`1458`	`1460`	`}`
`1459`	`1461`	`while (<>) {}`
`1460`	`1462`	'`"
`@@ -1504,8 +1506,10 @@ smimea_check()`
`1504`	`1506`	`use warnings;`
`1505`	`1507`	`while (<>)`
`1506`	`1508`	`{`
`1507`		`- print("$1\n"), last if /emailAddress = (\S+)/;`
	`1509`	`+ print("$1\n"), last if /emailAddress\s=\s(\S+)/;`
	`1510`	`+ print("$1\n"), last if /email\s:\s(\S+)/;`
`1508`	`1511`	`print("$1\n"), last if /SmtpUTF8Mailbox\s:[^:]:\s*(\S+)/;`
	`1512`	`+ print("$1\n"), last if /CN\s=\s(\S+@\S+)$/;`
`1509`	`1513`	`}`
`1510`	`1514`	`while (<>) {}`
`1511`	`1515`	'`"