3 files changed, 22 insertions, 22 deletions

diff --git a/contrib/sendmail/vacation/Makefile.m4 b/contrib/sendmail/vacation/Makefile.m4
index 0cd52361d719..ed4967ee5495 100644
--- a/contrib/sendmail/vacation/Makefile.m4
+++ b/contrib/sendmail/vacation/Makefile.m4
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 8.24.4.1 2002/06/21 21:58:50 ca Exp $
+dnl $Id: Makefile.m4,v 8.25 2002/06/21 22:01:57 ca Exp $
 include(confBUILDTOOLSDIR`/M4/switch.m4')
 
 define(`confREQUIRE_LIBSM', `true')
diff --git a/contrib/sendmail/vacation/vacation.1 b/contrib/sendmail/vacation/vacation.1
index 055fb7a4bf95..6c1418a0b245 100644
--- a/contrib/sendmail/vacation/vacation.1
+++ b/contrib/sendmail/vacation/vacation.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
 .\"	All rights reserved.
 .\" Copyright (c) 1985, 1987, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -9,9 +9,9 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"	$Id: vacation.1,v 8.29.2.1 2002/06/21 21:28:06 ca Exp $
+.\"	$Id: vacation.1,v 8.34 2002/06/27 23:51:52 ca Exp $
 .\"
-.TH VACATION 1 "$Date: 2002/06/21 21:28:06 $"
+.TH VACATION 1 "$Date: 2002/06/27 23:51:52 $"
 .SH NAME
 vacation
 \- E-mail auto-responder
@@ -26,9 +26,12 @@ vacation
 .IR database ]
 .RB [ \-i ]
 .RB [ \-I ]
+.RB [ \-j ]
 .RB [ \-l ]
 .RB [ \-m
 .IR message ]
+.RB [ \-R 
+.IR returnaddr ]
 .RB [ \-r 
 .IR interval ]
 .RB [ \-s
@@ -118,6 +121,15 @@ This should only be used on the command line, not in your
 .I .forward
 file.
 .TP
+.B \-j
+Respond to the message regardless of whether the login is listed as
+a recipient for the message.
+Do not use this flag unless you are sure of the consequences.
+For example, this will cause
+.i vacation
+to reply to mailing list messages which may result in removing
+you from the list.
+.TP
 .B \-l
 List the content of the vacation database file including the address
 and the associated time of the last auto-response to that address.
@@ -134,6 +146,9 @@ Unless the
 .I filename
 starts with / it is relative to ~.
 .TP
+.BI \-R " returnaddr"
+Set the reply envelope sender address
+.TP
 .BI \-r " interval"
 Set the reply interval to
 .I interval
diff --git a/contrib/sendmail/vacation/vacation.c b/contrib/sendmail/vacation/vacation.c
index 281119392bd2..45aeba190247 100644
--- a/contrib/sendmail/vacation/vacation.c
+++ b/contrib/sendmail/vacation/vacation.c
@@ -20,7 +20,7 @@ SM_IDSTR(copyright,
 	The Regents of the University of California.  All rights reserved.\n\
      Copyright (c) 1983 Eric P. Allman.  All rights reserved.\n")
 
-SM_IDSTR(id, "@(#)$Id: vacation.c,v 8.137.2.2 2002/11/01 16:48:55 ca Exp $")
+SM_IDSTR(id, "@(#)$Id: vacation.c,v 8.141 2002/11/01 16:49:40 ca Exp $")
 
 
 #include <ctype.h>
@@ -211,11 +211,9 @@ main(argc, argv)
 			initdb = true;
 			break;
 
-#if _FFR_RESPOND_ALL
 		  case 'j':
 			alwaysrespond = true;
 			break;
-#endif /* _FFR_RESPOND_ALL */
 
 		  case 'l':
 			list = true;		/* list the database */
@@ -225,11 +223,9 @@ main(argc, argv)
 			msgfilename = optarg;
 			break;
 
-#if _FFR_RETURN_ADDR
 		  case 'R':
 			returnaddr = optarg;
 			break;
-#endif /* _FFR_RETURN_ADDR */
 
 		  case 'r':
 			if (isascii(*optarg) && isdigit(*optarg))
@@ -1042,20 +1038,9 @@ sendmessage(myname, msgfn, sender)
 void
 usage()
 {
-	char *retusage = "";
-	char *respusage = "";
-
-#if _FFR_RETURN_ADDR
-	retusage = "[-R returnaddr] ";
-#endif /* _FFR_RETURN_ADDR */
-
-#if _FFR_RESPOND_ALL
-	respusage = "[-j] ";
-#endif /* _FFR_RESPOND_ALL */
-
 	msglog(LOG_NOTICE,
-	       "uid %u: usage: vacation [-a alias] [-C cfpath] [-d] [-f db] [-i] %s[-l] [-m msg] %s[-r interval] [-s sender] [-t time] [-U] [-x] [-z] login\n",
-	       getuid(), respusage, retusage);
+	       "uid %u: usage: vacation [-a alias] [-C cfpath] [-d] [-f db] [-i] [-j] [-l] [-m msg] [-R returnaddr] [-r interval] [-s sender] [-t time] [-U] [-x] [-z] login\n",
+	       getuid());
 	exit(EX_USAGE);
 }