From 3ef799fdd12e2129b8f6661cb7dd466e6e563fd4 Mon Sep 17 00:00:00 2001
From: des <des@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 30 May 2013 12:25:37 +0000
Subject: [PATCH] MFH (r248617): retire the mislabeled ENABLE_SUID_SSH knob.

git-svn-id: svn://svn.freebsd.org/base/stable/9@251134 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 secure/libexec/ssh-keysign/Makefile | 4 +---
 share/examples/etc/make.conf        | 3 ---
 share/man/man5/make.conf.5          | 5 -----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 75f1b6c4c..c5fc68815 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -4,9 +4,7 @@ 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
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index b9889e809..1f63b5b52 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -96,9 +96,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=
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index df6915349..75c910295 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -454,11 +454,6 @@ with the set-user-ID bit set.
 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
-- 
2.45.0