add openbsd OSTYPE (with additional mailer flag 'S') and use it

9 files changed, 47 insertions, 51 deletions

diff --git a/usr.sbin/sendmail/cf/cf/alatar.mc b/usr.sbin/sendmail/cf/cf/alatar.mc
index 0950d1f845a..22cfddbc215 100644
--- a/usr.sbin/sendmail/cf/cf/alatar.mc
+++ b/usr.sbin/sendmail/cf/cf/alatar.mc
@@ -30,6 +30,6 @@ divert(-1)
 #
 
 include(`../m4/cf.m4')dnl
-VERSIONID(`$OpenBSD: alatar.mc,v 1.1 1997/04/20 07:29:00 tholo Exp $')dnl
-OSTYPE(bsd4.4)dnl
+VERSIONID(`$OpenBSD: alatar.mc,v 1.2 1998/08/15 18:17:10 millert Exp $')dnl
+OSTYPE(openbsd)dnl
 FEATURE(nullclient, gandalf.$m)dnl
diff --git a/usr.sbin/sendmail/cf/cf/corpse.mc b/usr.sbin/sendmail/cf/cf/corpse.mc
index f2a2bcc51b4..80d3e065e6c 100644
--- a/usr.sbin/sendmail/cf/cf/corpse.mc
+++ b/usr.sbin/sendmail/cf/cf/corpse.mc
@@ -31,9 +31,9 @@ divert(-1)
 #
 
 include(`../m4/cf.m4')                                                  
-VERSIONID(`$OpenBSD: corpse.mc,v 1.1 1997/12/16 04:20:37 mickey Exp $')dnl
+VERSIONID(`$OpenBSD: corpse.mc,v 1.2 1998/08/15 18:17:11 millert Exp $')dnl
 
-OSTYPE(bsd4.4)dnl
+OSTYPE(openbsd)dnl
 
 define(`confFROM_HEADER', <$g$s>)dnl
 define(`LOCAL_RELAY',`mail.$m')dnl
diff --git a/usr.sbin/sendmail/cf/cf/elbereth.mc b/usr.sbin/sendmail/cf/cf/elbereth.mc
index 91f93abc1ed..b37f62ee21d 100644
--- a/usr.sbin/sendmail/cf/cf/elbereth.mc
+++ b/usr.sbin/sendmail/cf/cf/elbereth.mc
@@ -30,8 +30,8 @@ divert(-1)
 #
 
 include(`../m4/cf.m4')dnl
-VERSIONID(`$OpenBSD: elbereth.mc,v 1.3 1997/11/04 16:19:20 kstailey Exp $')dnl
-OSTYPE(bsd4.4)dnl
+VERSIONID(`$OpenBSD: elbereth.mc,v 1.4 1998/08/15 18:17:13 millert Exp $')dnl
+OSTYPE(openbsd)dnl
 MASQUERADE_AS(disclosure.com)dnl
 FEATURE(masquerade_envelope)dnl
 define(`SMART_HOST', `disclosure.com')
diff --git a/usr.sbin/sendmail/cf/cf/gandalf.mc b/usr.sbin/sendmail/cf/cf/gandalf.mc
index 93416d926a6..ae6a06fe656 100644
--- a/usr.sbin/sendmail/cf/cf/gandalf.mc
+++ b/usr.sbin/sendmail/cf/cf/gandalf.mc
@@ -30,8 +30,8 @@ divert(-1)
 #
 
 include(`../m4/cf.m4')dnl
-VERSIONID(`$OpenBSD: gandalf.mc,v 1.3 1998/08/02 06:50:22 tholo Exp $')dnl
-OSTYPE(bsd4.4)dnl
+VERSIONID(`$OpenBSD: gandalf.mc,v 1.4 1998/08/15 18:17:14 millert Exp $')dnl
+OSTYPE(openbsd)dnl
 DOMAIN(sigmasoft)dnl
 MASQUERADE_AS(SigmaSoft.COM)dnl
 FEATURE(allmasquerade)dnl
diff --git a/usr.sbin/sendmail/cf/cf/lucifier.mc b/usr.sbin/sendmail/cf/cf/lucifier.mc
index 7e16f0406b4..6344cc59b7c 100644
--- a/usr.sbin/sendmail/cf/cf/lucifier.mc
+++ b/usr.sbin/sendmail/cf/cf/lucifier.mc
@@ -31,8 +31,8 @@ divert(-1)
 #
 
 include(`../m4/cf.m4')dnl
-VERSIONID(`$OpenBSD: lucifier.mc,v 1.3 1998/03/27 08:15:52 deraadt Exp $')dnl
-OSTYPE(bsd4.4)dnl
+VERSIONID(`$OpenBSD: lucifier.mc,v 1.4 1998/08/15 18:17:15 millert Exp $')dnl
+OSTYPE(openbsd)dnl
 MAILER(local)dnl
 MAILER(smtp)dnl
 MASQUERADE_AS(lucifier.dial-up.user.akula.net)dnl
diff --git a/usr.sbin/sendmail/cf/cf/openbsd-proto.mc b/usr.sbin/sendmail/cf/cf/openbsd-proto.mc
index 7af350e84bc..bd0368e0fa4 100644
--- a/usr.sbin/sendmail/cf/cf/openbsd-proto.mc
+++ b/usr.sbin/sendmail/cf/cf/openbsd-proto.mc
@@ -1,50 +1,25 @@
 divert(-1)
 #
-# Copyright (c) 1994 Adam Glass
-# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
+# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 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. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
 #
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
 #
 
 #
 #  This is the prototype file for a configuration that supports nothing
 #  but basic SMTP connections via TCP.
 #
-#  You may want to add an OSTYPE macro to get the location of various
-#  support files for your operating system environment.
-#
 
+divert(0)dnl
 include(`../m4/cf.m4')
-VERSIONID(`@(#)openbsd-proto.mc	$Revision: 1.1 $')
-OSTYPE(bsd4.4)dnl
-MAILER(local)dnl
-MAILER(smtp)dnl
-
+VERSIONID(`@(#)openbsd-proto.mc $Revision: 1.2 $')
+OSTYPE(openbsd)
+FEATURE(nouucp)
+MAILER(local)
+MAILER(smtp)
diff --git a/usr.sbin/sendmail/cf/cf/saruman.mc b/usr.sbin/sendmail/cf/cf/saruman.mc
index 02c47e04519..8b17f10f1eb 100644
--- a/usr.sbin/sendmail/cf/cf/saruman.mc
+++ b/usr.sbin/sendmail/cf/cf/saruman.mc
@@ -30,6 +30,6 @@ divert(-1)
 #
 
 include(`../m4/cf.m4')dnl
-VERSIONID(`$OpenBSD: saruman.mc,v 1.1 1996/11/05 03:57:17 tholo Exp $')dnl
-OSTYPE(bsd4.4)dnl
+VERSIONID(`$OpenBSD: saruman.mc,v 1.2 1998/08/15 18:17:18 millert Exp $')dnl
+OSTYPE(openbsd)dnl
 FEATURE(nullclient, gandalf.$m)dnl
diff --git a/usr.sbin/sendmail/cf/cf/waldorf.mc b/usr.sbin/sendmail/cf/cf/waldorf.mc
index f0cdbcb5c1e..b633a039e0c 100644
--- a/usr.sbin/sendmail/cf/cf/waldorf.mc
+++ b/usr.sbin/sendmail/cf/cf/waldorf.mc
@@ -1,5 +1,5 @@
 divert(-1)
-#	$OpenBSD: waldorf.mc,v 1.5 1997/05/29 00:13:51 niklas Exp $
+#	$OpenBSD: waldorf.mc,v 1.6 1998/08/15 18:17:19 millert Exp $
 #
 # Copyright (c) 1996 Niklas Hallqvist
 # All rights reserved.
@@ -33,8 +33,8 @@ divert(-1)
 #
 
 include(`../m4/cf.m4')
-VERSIONID(`$OpenBSD: waldorf.mc,v 1.5 1997/05/29 00:13:51 niklas Exp $')
-OSTYPE(bsd4.4)dnl
+VERSIONID(`$OpenBSD: waldorf.mc,v 1.6 1998/08/15 18:17:19 millert Exp $')
+OSTYPE(openbsd)dnl
 
 MASQUERADE_AS(appli.se)
 MASQUERADE_DOMAIN(appli.se)
diff --git a/usr.sbin/sendmail/cf/ostype/openbsd.m4 b/usr.sbin/sendmail/cf/ostype/openbsd.m4
new file mode 100644
index 00000000000..c00c942df42
--- /dev/null
+++ b/usr.sbin/sendmail/cf/ostype/openbsd.m4
@@ -0,0 +1,21 @@
+divert(-1)
+#
+# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
+# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+#
+
+divert(0)
+VERSIONID(`@(#)bsd4.4.m4	8.9 (Berkeley) 5/19/98')
+ifdef(`HELP_FILE',, `define(`HELP_FILE', /usr/share/misc/sendmail.hf)')dnl
+ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /var/log/sendmail.st)')dnl
+ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
+ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `rmn9S')')dnl
+ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl