[Midnightbsd-cvs] src [9454] trunk: retire the mislabeled ENABLE_SUID_SSH knob.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 5 14:33:36 EST 2017


Revision: 9454
          http://svnweb.midnightbsd.org/src/?rev=9454
Author:   laffer1
Date:     2017-03-05 14:33:35 -0500 (Sun, 05 Mar 2017)
Log Message:
-----------
retire the mislabeled ENABLE_SUID_SSH knob.

Modified Paths:
--------------
    trunk/secure/libexec/ssh-keysign/Makefile
    trunk/share/examples/etc/make.conf
    trunk/share/man/man5/make.conf.5

Modified: trunk/secure/libexec/ssh-keysign/Makefile
===================================================================
--- trunk/secure/libexec/ssh-keysign/Makefile	2017-03-05 19:33:06 UTC (rev 9453)
+++ trunk/secure/libexec/ssh-keysign/Makefile	2017-03-05 19:33:35 UTC (rev 9454)
@@ -1,12 +1,10 @@
-# $MidnightBSD: src/secure/libexec/ssh-keysign/Makefile,v 1.4 2009/05/02 18:00:56 laffer1 Exp $
+# $MidnightBSD$
 
 PROG=	ssh-keysign
 SRCS=	ssh-keysign.c readconf.c roaming_dummy.c
 MAN=	ssh-keysign.8
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
-.if defined(ENABLE_SUID_SSH)
-BINMODE=4511
-.endif
+BINMODE=4555
 
 DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
 LDADD=	-lssh -lcrypt -lcrypto -lz

Modified: trunk/share/examples/etc/make.conf
===================================================================
--- trunk/share/examples/etc/make.conf	2017-03-05 19:33:06 UTC (rev 9453)
+++ trunk/share/examples/etc/make.conf	2017-03-05 19:33:35 UTC (rev 9454)
@@ -97,9 +97,6 @@
 # Mtree will follow symlinks
 #MTREE_FOLLOWS_SYMLINKS= -L
 #
-# To enable installing ssh(1) with the setuid bit turned on
-#ENABLE_SUID_SSH=
-#
 # To enable installing newgrp(1) with the setuid bit turned on.
 # Without the setuid bit, newgrp cannot change users' groups.
 #ENABLE_SUID_NEWGRP=

Modified: trunk/share/man/man5/make.conf.5
===================================================================
--- trunk/share/man/man5/make.conf.5	2017-03-05 19:33:06 UTC (rev 9453)
+++ trunk/share/man/man5/make.conf.5	2017-03-05 19:33:35 UTC (rev 9454)
@@ -466,11 +466,6 @@
 Otherwise,
 .Xr newgrp 1
 will not be able to change users' groups.
-.It Va ENABLE_SUID_SSH
-.Pq Vt bool
-Set this to install
-.Xr ssh 1
-with the set-user-ID bit turned on.
 .It Va LOADER_TFTP_SUPPORT
 .Pq Vt bool
 By default the



More information about the Midnightbsd-cvs mailing list