From owner-svn-src-head@FreeBSD.ORG  Fri Mar 22 14:10:16 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4F8C558C;
 Fri, 22 Mar 2013 14:10:16 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2711EE1C;
 Fri, 22 Mar 2013 14:10:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2MEAGoF066930;
 Fri, 22 Mar 2013 14:10:16 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2MEAFmW066927;
 Fri, 22 Mar 2013 14:10:15 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201303221410.r2MEAFmW066927@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Fri, 22 Mar 2013 14:10:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248617 - in head: secure/libexec/ssh-keysign
 share/examples/etc share/man/man5
X-SVN-Group: head
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Mar 2013 14:10:16 -0000

Author: des
Date: Fri Mar 22 14:10:15 2013
New Revision: 248617
URL: http://svnweb.freebsd.org/changeset/base/248617

Log:
  Retire the mislabeled ENABLE_SUID_SSH knob.

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

Modified: head/secure/libexec/ssh-keysign/Makefile
==============================================================================
--- head/secure/libexec/ssh-keysign/Makefile	Fri Mar 22 13:36:03 2013	(r248616)
+++ head/secure/libexec/ssh-keysign/Makefile	Fri Mar 22 14:10:15 2013	(r248617)
@@ -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

Modified: head/share/examples/etc/make.conf
==============================================================================
--- head/share/examples/etc/make.conf	Fri Mar 22 13:36:03 2013	(r248616)
+++ head/share/examples/etc/make.conf	Fri Mar 22 14:10:15 2013	(r248617)
@@ -102,9 +102,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: head/share/man/man5/make.conf.5
==============================================================================
--- head/share/man/man5/make.conf.5	Fri Mar 22 13:36:03 2013	(r248616)
+++ head/share/man/man5/make.conf.5	Fri Mar 22 14:10:15 2013	(r248617)
@@ -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