diff options
-rw-r--r-- | secure/libexec/Makefile | 2 | ||||
-rw-r--r-- | secure/libexec/ssh-keysign/Makefile (renamed from secure/usr.bin/ssh-keysign/Makefile) | 3 | ||||
-rw-r--r-- | secure/usr.bin/Makefile | 2 | ||||
-rw-r--r-- | secure/usr.bin/ssh/Makefile | 3 |
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 |