diff options
| author | des <des@FreeBSD.org> | 2002-07-05 08:39:09 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-07-05 08:39:09 +0000 |
| commit | a651b056f9af4d848fbf5081a81e873a6facec95 (patch) | |
| tree | 5250eb7f3801cd1cd8afc6b8e1048910a9748149 /secure/usr.bin | |
| parent | 596ff14965fbb61a0bc595e55993b3b262028400 (diff) | |
| download | FreeBSD-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/usr.bin')
| -rw-r--r-- | secure/usr.bin/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh-keysign/Makefile | 12 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 3 |
3 files changed, 1 insertions, 16 deletions
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-keysign/Makefile b/secure/usr.bin/ssh-keysign/Makefile deleted file mode 100644 index 5fdd672..0000000 --- a/secure/usr.bin/ssh-keysign/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -PROG= ssh-keysign -MAN= ssh-keysign.8 -CFLAGS+=-I${SSHDIR} - -DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypto -lz - -.include <bsd.prog.mk> - -.PATH: ${SSHDIR} 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 |
