From af04f6e4f64277942ea24c400477dec853f5d26e Mon Sep 17 00:00:00 2001
From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Wed, 16 Dec 1992 01:17:32 -0800
Subject: [PATCH] restore # as comment symbol in .forward/:include:; extend -p
 flag; remove = option (use V instead)

SCCS-vsn: usr.sbin/sendmail/src/recipient.c 5.39
SCCS-vsn: usr.sbin/sendmail/src/main.c 5.62
SCCS-vsn: usr.sbin/sendmail/src/version.c 5.134
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 5.54
---
 usr/src/usr.sbin/sendmail/src/main.c      | 12 +++++++++---
 usr/src/usr.sbin/sendmail/src/readcf.c    |  6 +-----
 usr/src/usr.sbin/sendmail/src/recipient.c |  4 +++-
 usr/src/usr.sbin/sendmail/src/version.c   |  4 ++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 86de15286d..aef497e105 100644
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,7 +13,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)main.c	5.61 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c	5.62 (Berkeley) %G%";
 #endif /* not lint */
 
 #define	_DEFINE
@@ -110,6 +110,7 @@ main(argc, argv, envp)
 	char **envp;
 {
 	register char *p;
+	register char *q;
 	char **av;
 	char *locname;
 	extern int finis();
@@ -282,7 +283,6 @@ main(argc, argv, envp)
 		av = myhostname(jbuf, sizeof jbuf);
 		if (jbuf[0] != '\0')
 		{
-			register char *q;
 			extern char *strchr();
 
 			if (tTd(0, 4))
@@ -441,7 +441,13 @@ main(argc, argv, envp)
 				av--;
 				break;
 			}
-			define('r', newstr(p), CurEnv);
+			q = strchr(p, ':');
+			if (q != NULL)
+				*q++ = '\0';
+			if (*p != '\0')
+				define('r', newstr(p), CurEnv);
+			if (*q != '\0')
+				define('s', newstr(q), CurEnv);
 			break;
 
 		  case 'q':	/* run queue files at intervals */
diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 2449813e92..13342884a0 100644
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)readcf.c	5.53 (Berkeley) %G%";
+static char sccsid[] = "@(#)readcf.c	5.54 (Berkeley) %G%";
 #endif /* not lint */
 
 # include "sendmail.h"
@@ -799,10 +799,6 @@ setoption(opt, val, sticky)
 
 	switch (opt)
 	{
-	  case '=':		/* config file generation level */
-		ConfigLevel = atoi(val);
-		break;
-
 	  case '8':		/* allow eight-bit input */
 		EightBit = atobool(val);
 		break;
diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 533ac9f52b..6ba94c4101 100644
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)recipient.c	5.38 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c	5.39 (Berkeley) %G%";
 #endif /* not lint */
 
 # include <sys/types.h>
@@ -726,6 +726,8 @@ include(fname, forwarding, ctladdr, sendq, e)
 		LineNumber++;
 		if (p != NULL)
 			*p = '\0';
+		if (*p == '#' || *p == '\0')
+			continue;
 		e->e_to = oldto;
 		message(Arpa_Info, "%s to %s",
 			forwarding ? "forwarding" : "sending", buf);
diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 8e46d375e2..9ba8724bab 100644
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)version.c	5.133 (Berkeley) %G%";
+static char sccsid[] = "@(#)version.c	5.134 (Berkeley) %G%";
 #endif /* not lint */
 
-char	Version[] = "5.133";
+char	Version[] = "5.134";
-- 
2.20.1