support rfc2919 List-Id, from Tamas TEVESZ, ok millert

2 files changed, 17 insertions, 3 deletions

diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index dbf1b43d188..9df6c7d1823 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vacation.1,v 1.17 2007/02/23 16:16:12 deraadt Exp $
+.\"	$OpenBSD: vacation.1,v 1.18 2007/02/27 15:51:17 deraadt Exp $
 .\"	$NetBSD: vacation.1,v 1.5 1995/08/31 21:57:08 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1987, 1990, 1991, 1993
@@ -132,6 +132,10 @@ An
 line is included in the mail headers
 with a value of anything but
 .Dq no .
+.It
+A
+.Dq List-Id
+line (with any value) is included in the mail headers.
 .El
 .Pp
 The people who have sent you messages are maintained as a
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index a54272f01f4..b3e36df125d 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vacation.c,v 1.27 2007/02/23 15:55:17 millert Exp $	*/
+/*	$OpenBSD: vacation.c,v 1.28 2007/02/27 15:51:17 deraadt Exp $	*/
 /*	$NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)vacation.c	8.2 (Berkeley) 1/26/94";
 #endif
-static char rcsid[] = "$OpenBSD: vacation.c,v 1.27 2007/02/23 15:55:17 millert Exp $";
+static char rcsid[] = "$OpenBSD: vacation.c,v 1.28 2007/02/27 15:51:17 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -241,6 +241,16 @@ readheaders(void)
 					exit(0);
 			}
 			break;
+		case 'L':		/* "List-Id:" */
+		case 'l':
+			cont = 0;
+			/*
+			 * If present (with any value), message is coming from a
+			 * mailing list, cf. RFC2919.
+			 */
+			if (strncasecmp(buf, "List-Id:", 8) == 0)
+				exit(0);
+			break;
 		case 'R':		/* "Return-Path:" */
 		case 'r':
 			cont = 0;