From owner-svn-src-head@freebsd.org  Wed Jun  6 01:51:07 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8308FDC0DD;
 Wed,  6 Jun 2018 01:51:06 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 990BE7E2FA;
 Wed,  6 Jun 2018 01:51:06 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A4752468A;
 Wed,  6 Jun 2018 01:51:06 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w561p6bV054214;
 Wed, 6 Jun 2018 01:51:06 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w561p6JY054213;
 Wed, 6 Jun 2018 01:51:06 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201806060151.w561p6JY054213@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Wed, 6 Jun 2018 01:51:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334700 - in head/etc: rc.d sendmail
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: in head/etc: rc.d sendmail
X-SVN-Commit-Revision: 334700
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jun 2018 01:51:07 -0000

Author: brd
Date: Wed Jun  6 01:51:05 2018
New Revision: 334700
URL: https://svnweb.freebsd.org/changeset/base/334700

Log:
  Only create /var/log/sendmail.st if start sendmail.
  
  For those of us that never use or start sendmail, it is unneeded.
  
  Approved by:	bapt (mentor)

Modified:
  head/etc/rc.d/sendmail
  head/etc/sendmail/Makefile

Modified: head/etc/rc.d/sendmail
==============================================================================
--- head/etc/rc.d/sendmail	Wed Jun  6 01:30:48 2018	(r334699)
+++ head/etc/rc.d/sendmail	Wed Jun  6 01:51:05 2018	(r334700)
@@ -197,6 +197,10 @@ sendmail_precmd()
 			sendmail_cert_create
 		fi
 	fi
+
+	if [ ! -f /var/log/sendmail.st ]; then
+		/usr/bin/install -m 640 -o root -g wheel /dev/null /var/log/sendmail.st
+	fi
 }
 
 run_rc_command "$1"

Modified: head/etc/sendmail/Makefile
==============================================================================
--- head/etc/sendmail/Makefile	Wed Jun  6 01:30:48 2018	(r334699)
+++ head/etc/sendmail/Makefile	Wed Jun  6 01:51:05 2018	(r334700)
@@ -70,8 +70,6 @@ distribution:
 	    ${.CURDIR}/freebsd.submit.mc freebsd.submit.cf ${DESTDIR}/etc/mail
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${SMDIR}/helpfile ${DESTDIR}/etc/mail
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 \
-	    /dev/null ${DESTDIR}/var/log/sendmail.st
 .if defined(INSTALL_CF)
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${INSTALL_CF} ${DEST_CF}