 @@ -1,14 +1,14 @@
-.\"	$NetBSD: vacation.1,v 1.32 2019/05/06 06:56:07 wiz Exp $
+.\"	$NetBSD: vacation.1,v 1.33 2023/04/11 10:34:52 hauke Exp $
 .\"
 .\" Copyright (c) 1985, 1987, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -162,62 +162,70 @@ to determine the To: field.
 .El
 .Pp
 No message will be sent unless
 .Ar login
 (or an
 .Ar alias
 supplied using the
 .Fl a
 option) is part of either the
 .Dq To:
 or
 .Dq Cc:
 headers of the mail.
 .Pp
 No messages from
 .Dq ???-REQUEST ,
 .Dq Postmaster ,
 .Dq Tn UUCP ,
 .Dq MAILER ,
 or
 .Dq MAILER-DAEMON
 will be replied to (where these strings are
-case insensitive) nor is a notification sent if a
+case insensitive).
 .Pp
 No notification is sent if a
 .Dq Precedence: bulk
 .Dq Precedence: list
 or
 .Dq Precedence: junk
-line is included in the mail headers.
+line or an
 .Dq Auto-Submitted:
 line with any qualifier except
 .Dq no
 are included in the mail headers.
 .Nm
 will include these headers in its response to avoid auto-responder loops.
 .Pp
 The people who have sent you messages are maintained as a
 .Xr db 3
 database in the file
 .Pa .vacation.db
 in your home directory.
 .Pp
 .Nm
 expects a file
 .Pa .vacation.msg ,
-in your home directory, containing a message to be sent back to each
+in your home directory containing a message to be sent back to each
 sender.
 It should be an entire message (including headers).
 If the message contains the string
 .Dv $SUBJECT
 then it will will be replaced with the subject of the original message.
 For example, it might contain:
 .Pp
 .Bd -literal -offset indent -compact
 From: eric@CS.Berkeley.EDU (Eric Allman)
 Subject: I am on vacation
 Delivered-By-The-Graces-Of: The Vacation program
 Precedence: bulk
 I am on vacation until July 22.
 Your mail regarding "$SUBJECT" will be read when I return.
 If you have something urgent, please contact Keith Bostic
 <bostic@CS.Berkeley.EDU>.
 --eric
 .Ed
 .Pp
 .Nm
 reads the first line from the standard input for a
 .Ux
 .Dq From
 line to determine the sender.
 @@ -232,25 +240,28 @@ with incorrect arguments, or with non-ex
 .Ar login Ns Ar s ,
 are logged in the system log file, using
 .Xr syslog 3 .
 .Sh FILES
 .Bl -tag -width "vacation.dirxxx" -compact
 .It Pa ~/.vacation.db
 database file
 .It Pa ~/.vacation.msg
 message to send
 .El
 .Sh SEE ALSO
 .Xr sendmail 1 ,
 .Xr syslog 3
 .Pp
 RFC 2076 ,
 RFC 3834
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.3 .
 .Sh BUGS
 Adding
 .Fl T Ar A
 or
 .Fl T Ar D
 should only be done for misconfigured or non-compliant MTAs.
 Doing so may auto-respond to messages that were not supposed to be replied to.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vacation.c,v 1.37 2019/05/05 23:08:37 pgoyette Exp $	*/
+/*	$NetBSD: vacation.c,v 1.38 2023/04/11 10:34:52 hauke Exp $	*/
 /*
  * Copyright (c) 1983, 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -30,27 +30,27 @@
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1987, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)vacation.c	8.2 (Berkeley) 1/26/94";
 #endif
-__RCSID("$NetBSD: vacation.c,v 1.37 2019/05/05 23:08:37 pgoyette Exp $");
+__RCSID("$NetBSD: vacation.c,v 1.38 2023/04/11 10:34:52 hauke Exp $");
 #endif /* not lint */
 /*
 **  Vacation
 **  Copyright (c) 1983  Eric P. Allman
 **  Berkeley, California
 */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <db.h>
 @@ -315,59 +315,73 @@ readheaders(void)
 	cont = tome = 0;
 #define COMPARE(a, b)		strncmp(a, b, sizeof(b) - 1)
 #define CASECOMPARE(a, b)	strncasecmp(a, b, sizeof(b) - 1)
 	while (fgets(buf, sizeof(buf), stdin) && *buf != '\n')
 		switch(*buf) {
 		case 'F':		/* "From " or "From:" */
 			cont = 0;
 			if (COMPARE(buf, "From ") == 0)
 				getfrom(buf + sizeof("From ") - 1);
 			if ((fflag & FROM_FROM) != 0 &&
 			    COMPARE(buf, "From:") == 0)
 				getfrom(buf + sizeof("From:") - 1);
 			break;
-		case 'P':		/* "Precedence:" */
+		case 'P':		/* "Precedence:" rfc 2076 ch 3.9 */
 			cont = 0;
 			if (CASECOMPARE(buf, "Precedence") != 0 ||
 			    (buf[10] != ':' && buf[10] != ' ' &&
 			    buf[10] != '\t'))
 				break;
 			if ((p = strchr(buf, ':')) == NULL)
 				break;
 			while (*++p && isspace((unsigned char)*p))
 				continue;
 			if (!*p)
 				break;
 			if (CASECOMPARE(p, "junk") == 0 ||
 			    CASECOMPARE(p, "bulk") == 0||
 			    CASECOMPARE(p, "list") == 0)
 				exit(0);
 			break;
 		case 'C':		/* "Cc:" */
 			if (COMPARE(buf, "Cc:"))
 				break;
 			cont = 1;
 			goto findme;
 		case 'T':		/* "To:" */
 			if (COMPARE(buf, "To:"))
 				break;
 			cont = 1;
 			goto findme;
-		case 'A':		/* "Apparently-To:" */
+		case 'A':
-			if ((tflag & APPARENTLY_TO) == 0 ||
+                        /* "Apparently-To:" */
-			    COMPARE(buf, "Apparently-To:") != 0)
+			if ((tflag & APPARENTLY_TO) != 0 &&
 			    COMPARE(buf, "Apparently-To:") == 0) {
 				cont = 1;
 				goto findme;
+			}
 			/* "Auto-Submitted:" rfc 3834 ch 5 */
 			cont = 0;
 			if (CASECOMPARE(buf, "Auto-Submitted") != 0 ||
 			    (buf[14] != ':' && buf[14] != ' ' &&
 			    buf[14] != '\t'))
 				break;
-			cont = 1;
+			if ((p = strchr(buf, ':')) == NULL)
-			goto findme;
+				break;
 			while (*++p && isspace((unsigned char)*p))
 				continue;
 			if (CASECOMPARE(p, "no") != 0 )
 				exit(0);
 			break;
 		case 'D':		/* "Delivered-To:" */
 			if ((tflag & DELIVERED_TO) == 0 ||
 			    COMPARE(buf, "Delivered-To:") != 0)
 				break;
 			cont = 1;
 			goto findme;
 		case 'R':		/* "Return-Path:" */
 			cont = 0;
 			if ((fflag & RETURN_PATH_FROM) != 0 &&
 			    COMPARE(buf, "Return-Path:") == 0)
 				getfrom(buf + sizeof("Return-Path:") - 1);
 			break;
 		case 'S':		/* "Sender:" */
 @@ -618,26 +632,27 @@ sendmessage(const char *myname)
 			    getprogname(), _PATH_SENDMAIL);
 			_exit(1);
+		}
 		(void)close(pvect[0]);
 		sfp = fdopen(pvect[1], "w");
 		if (sfp == NULL) {
 			syslog(LOG_ERR, "%s: can't fdopen %d: %m",
 			    getprogname(), pvect[1]);
 			_exit(1);
+		}
+	}
 	(void)fprintf(sfp, "To: %s\n", from);
 	(void)fputs("Auto-Submitted: auto-replied\n", sfp);
 	(void)fputs("Precedence: bulk\n", sfp);
 	while (fgets(buf, sizeof buf, mfp) != NULL) {
 		char *p;
 		if ((p = strstr(buf, "$SUBJECT")) != NULL) {
 			*p = '\0';
 			(void)fputs(buf, sfp);
 			(void)fputs(subject, sfp);
 			p += sizeof("$SUBJECT") - 1;
 			(void)fputs(p, sfp);
 		} else
 		    (void)fputs(buf, sfp);
+	}
 	(void)fclose(mfp);
 	if (sfp != stdout)