From d25bb4240f51e35d71f3564de7c31aa1cd0fbc2e Mon Sep 17 00:00:00 2001
From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Fri, 13 Dec 1991 22:54:29 -0800
Subject: [PATCH] some System V hacks....

SCCS-vsn: usr.sbin/sendmail/src/main.c 5.39
SCCS-vsn: usr.sbin/sendmail/src/conf.h 5.22
---
 usr/src/usr.sbin/sendmail/src/conf.h | 11 +++++++++--
 usr/src/usr.sbin/sendmail/src/main.c |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 011ea7a155..bc428ba207 100644
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)conf.h	5.21 (Berkeley) %G%
+ *	@(#)conf.h	5.22 (Berkeley) %G%
  */
 
 /*
@@ -37,6 +37,10 @@
 **	#define these if they are available; comment them out otherwise.
 */
 
+# ifdef hpux
+# define SYSTEM5	1
+# endif
+
 /* # define DBM		1	/* use DBM library (requires -ldbm) */
 /* # define NDBM	1	/* new DBM library available (requires DBM) */
 # define NEWDB		1	/* use new 4.4bsd database package db(3) */
@@ -48,7 +52,10 @@
 # define SETPROCTITLE	1	/* munge argv to display current status */
 # define NAMED_BIND	1	/* use Berkeley Internet Domain Server */
 # define USERDB		1	/* look in user database */
-/* # define LOCKF	1	/* use System V lockf instead of flock */
+
+# ifdef SYSTEM5
+# define LOCKF		1	/* use System V lockf instead of flock */
+# endif
 
 /*
 **  Older systems don't have this error code -- it should be in
diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 09455456f9..1f9b4b8b4f 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.38 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c	5.39 (Berkeley) %G%";
 #endif /* not lint */
 
 #define	_DEFINE
@@ -130,8 +130,10 @@ main(argc, argv, envp)
 	extern ADDRESS *recipient();
 	bool canrename;
 
+# ifndef SYSTEM5
 	/* Enforce use of local time */
 	unsetenv("TZ");
+# endif
 
 	/*
 	**  Be sure we have enough file descriptors.
-- 
2.20.1