svn commit: r251134 - in stable/9: secure/libexec/ssh-keysign share/examples/etc share/man/man5

[Dag-Erling Smørgrav]

Author: des
Date: Thu May 30 12:25:37 2013
New Revision: 251134
URL: http://svnweb.freebsd.org/changeset/base/251134

Log:
  MFH (r248617): retire the mislabeled ENABLE_SUID_SSH knob.

Modified:
  stable/9/secure/libexec/ssh-keysign/Makefile
  stable/9/share/examples/etc/make.conf
  stable/9/share/man/man5/make.conf.5
Directory Properties:
  stable/9/secure/libexec/ssh-keysign/   (props changed)
  stable/9/share/examples/   (props changed)
  stable/9/share/examples/etc/   (props changed)
  stable/9/share/man/man5/   (props changed)

Modified: stable/9/secure/libexec/ssh-keysign/Makefile
==============================================================================
--- stable/9/secure/libexec/ssh-keysign/Makefile	Thu May 30 12:16:55 2013	(r251133)
+++ stable/9/secure/libexec/ssh-keysign/Makefile	Thu May 30 12:25:37 2013	(r251134)
@@ -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: stable/9/share/examples/etc/make.conf
==============================================================================
--- stable/9/share/examples/etc/make.conf	Thu May 30 12:16:55 2013	(r251133)
+++ stable/9/share/examples/etc/make.conf	Thu May 30 12:25:37 2013	(r251134)
@@ -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=

Modified: stable/9/share/man/man5/make.conf.5
==============================================================================
--- stable/9/share/man/man5/make.conf.5	Thu May 30 12:16:55 2013	(r251133)
+++ stable/9/share/man/man5/make.conf.5	Thu May 30 12:25:37 2013	(r251134)
@@ -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