summaryrefslogtreecommitdiffstats
path: root/secure
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2002-07-05 08:39:09 +0000
committerdes <des@FreeBSD.org>2002-07-05 08:39:09 +0000
commita651b056f9af4d848fbf5081a81e873a6facec95 (patch)
tree5250eb7f3801cd1cd8afc6b8e1048910a9748149 /secure
parent596ff14965fbb61a0bc595e55993b3b262028400 (diff)
downloadFreeBSD-src-a651b056f9af4d848fbf5081a81e873a6facec95.zip
FreeBSD-src-a651b056f9af4d848fbf5081a81e873a6facec95.tar.gz
ssh-keysign(8) belongs in /usr/libexec, not in /usr/bin, and needs to be
setuid so ssh(1) doesn't have to be. Pointy hat to: des Submitted by: Katsuyuki TATEISHI <katsu@iec.hiroshima-u.ac.jp>
Diffstat (limited to 'secure')
-rw-r--r--secure/libexec/Makefile2
-rw-r--r--secure/libexec/ssh-keysign/Makefile (renamed from secure/usr.bin/ssh-keysign/Makefile)3
-rw-r--r--secure/usr.bin/Makefile2
-rw-r--r--secure/usr.bin/ssh/Makefile3
4 files changed, 5 insertions, 5 deletions
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index cd8405b..dba0331 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -4,7 +4,7 @@
SUBDIR= telnetd
.endif
.if !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
-SUBDIR+=sftp-server
+SUBDIR+=sftp-server ssh-keysign
.endif
.include <bsd.subdir.mk>
diff --git a/secure/usr.bin/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 5fdd672..7a21e59 100644
--- a/secure/usr.bin/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -3,6 +3,9 @@
PROG= ssh-keysign
MAN= ssh-keysign.8
CFLAGS+=-I${SSHDIR}
+.if defined(ENABLE_SUID_SSH)
+BINMODE=4511
+.endif
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
LDADD= -lssh -lcrypto -lz
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index bcc8aa2..42b8aa2 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -7,7 +7,7 @@ SUBDIR+=telnet
.if !defined(NO_OPENSSL)
SUBDIR+=openssl
.if !defined(NO_OPENSSH)
-SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan ssh-keysign
+SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan
.endif
.endif
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index d9ba6a7..42964ca 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -3,9 +3,6 @@
PROG= ssh
CFLAGS+=-I${SSHDIR}
-.if defined(ENABLE_SUID_SSH)
-BINMODE=4555
-.endif
LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
MAN= ssh.1 ssh_config.5
MLINKS= ssh.1 slogin.1
OpenPOWER on IntegriCloud