From ac00b13dbb2feef911af4aa717288c88c683fa34 Mon Sep 17 00:00:00 2001
From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Thu, 25 May 1995 18:37:56 -0800
Subject: [PATCH] preinitialized $=m late, so that .cf can redefined $m

SCCS-vsn: usr.sbin/sendmail/src/main.c 8.114
---
 usr/src/usr.sbin/sendmail/src/main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index a7bddc7bd8..69105bf6b8 100644
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,7 +13,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)main.c	8.113 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c	8.114 (Berkeley) %G%";
 #endif /* not lint */
 
 #define	_DEFINE
@@ -361,7 +361,6 @@ main(argc, argv, envp)
 			if (p[1] != '\0')
 			{
 				define('m', newstr(&p[1]), CurEnv);
-				setclass('m', &p[1]);
 			}
 			while (p != NULL && strchr(&p[1], '.') != NULL)
 			{
@@ -672,6 +671,10 @@ main(argc, argv, envp)
 	readcf(getcfname(), safecf, CurEnv);
 	vendor_post_defaults(CurEnv);
 
+	/* set up the $=m class now, after .cf has a chance to redefine $m */
+	expand("\201m", jbuf, sizeof jbuf, CurEnv);
+	setclass('m', jbuf);
+
 	if (tTd(0, 1))
 	{
 		printf("SYSTEM IDENTITY (after readcf):");
-- 
2.20.1