make.conf(5): Remove SENDMAIL_SET_USER_ID functionality
authorJohn Marino <draco@marino.st>
Tue, 10 Mar 2015 08:20:33 +0000 (09:20 +0100)
committerJohn Marino <draco@marino.st>
Tue, 10 Mar 2015 09:21:45 +0000 (10:21 +0100)
This sendmail option has been deprecated and off by default since version
8.12.  It is also not supported by dports Sendmail, probably due to its
security risks.  It makes no sense anymore, so remove it separately ahead
of additional anticipated base Sendmail changes.

etc/defaults/make.conf
etc/mail/Makefile
etc/sendmail/Makefile
share/man/man5/make.conf.5

index ce738e6..773f9d7 100644 (file)
@@ -213,14 +213,6 @@ STATIC_LOCALES=UTF8
 #
 #SENDMAIL_M4_FLAGS=
 #
-# Setting SENDMAIL_SET_USER_ID will install the sendmail binary as a
-# set-user-ID root binary instead of a set-group-ID smmsp binary and will
-# prevent the installation of /etc/mail/submit.cf.
-# This is a deprecated mode of operation.  See etc/mail/README for more
-# information.
-#
-#SENDMAIL_SET_USER_ID=
-#
 # The permissions to use on alias and map databases generated using
 # /etc/mail/Makefile.  Defaults to 0640.
 #
index c65c472..bbe7a02 100644 (file)
@@ -82,10 +82,7 @@ ${SENDMAIL_SUBMIT_MC}:
 .endif
 
 INSTALL_CF=            ${SENDMAIL_MC:R}.cf
-
-.ifndef SENDMAIL_SET_USER_ID
 INSTALL_SUBMIT_CF=     ${SENDMAIL_SUBMIT_MC:R}.cf
-.endif
 
 SENDMAIL_ALIASES?=     /etc/mail/aliases
 
@@ -191,11 +188,7 @@ depend:
 
 cf:            ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
 
-.ifdef SENDMAIL_SET_USER_ID
-install: install-cf
-.else
 install: install-cf install-submit-cf
-.endif
 
 install-cf:    ${INSTALL_CF}
 .if ${INSTALL_CF} != /etc/mail/sendmail.cf
@@ -204,16 +197,9 @@ install-cf:        ${INSTALL_CF}
 
 
 install-submit-cf:     ${INSTALL_SUBMIT_CF}
-.ifdef SENDMAIL_SET_USER_ID
-       @echo ">>> ERROR: You should not create a submit.cf file if you are using a"
-       @echo "           set-user-ID sendmail binary (SENDMAIL_SET_USER_ID is set"
-       @echo "           in make.conf)."
-       @false
-.else
 .if ${INSTALL_SUBMIT_CF} != /etc/mail/submit.cf
        ${INSTALL} -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf
 .endif
-.endif
 
 aliases:       ${SENDMAIL_ALIASES:%=%.db}
 
index d93602e..a2b5415 100644 (file)
@@ -43,7 +43,7 @@ ALL+=         ${SENDMAIL_CF}
 INSTALL_CF=    ${SENDMAIL_CF}
 .endif
 
-.if !defined(SENDMAIL_SET_USER_ID) && defined(SENDMAIL_SUBMIT_MC)
+.if defined(SENDMAIL_SUBMIT_MC)
 INSTALL_SUBMIT_CF= ${SENDMAIL_SUBMIT_MC:T:R}.cf
 ALL+=          ${INSTALL_SUBMIT_CF}
 CLEANFILES+=   ${INSTALL_SUBMIT_CF}
@@ -89,8 +89,7 @@ install:
        ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
            ${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail
 .endif
-.if !defined(SENDMAIL_SET_USER_ID) && \
-    defined(INSTALL_SUBMIT_CF) && ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
+.if defined(INSTALL_SUBMIT_CF) && ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
        ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
            ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
 .endif
index f2a96dd..86afb45 100644 (file)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $
 .\"
-.Dd March 9, 2015
+.Dd March 10, 2015
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -516,16 +516,6 @@ when building a
 file from a
 .Pa .mc
 file.
-.It Va SENDMAIL_SET_USER_ID
-.Pq Vt bool
-If set, install
-.Xr sendmail 8
-as a set-user-ID root binary instead of a set-group-ID binary
-and do not install
-.Pa /etc/mail/submit.{cf,mc} .
-Use of this flag is not recommended and the alternative advice in
-.Pa /etc/mail/README
-should be followed instead if at all possible.
 .It Va SENDMAIL_MAP_PERMS
 .Pq Vt str
 Mode to use when generating alias and map database files using
@@ -596,8 +586,7 @@ or
 .Xr gcc 1 ,
 .Xr install 1 ,
 .Xr make 1 ,
-.Xr lpd 8 ,
-.Xr sendmail 8
+.Xr lpd 8
 .Sh HISTORY
 The
 .Nm