From e3a22a47d883caa7edcce2f2d6c4bda41011b204 Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Fri, 27 Aug 2021 18:42:53 -0400 Subject: md5: Don't symlink non working bins, setuid appropriate bins --- diskdev_cmds/quota.tproj/Makefile | 3 +++ shell_cmds/su/Makefile | 3 +++ system_cmds/passwd.tproj/Makefile | 3 +++ text_cmds/md5/Makefile | 18 ++---------------- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/diskdev_cmds/quota.tproj/Makefile b/diskdev_cmds/quota.tproj/Makefile index ba137fe..3002f80 100644 --- a/diskdev_cmds/quota.tproj/Makefile +++ b/diskdev_cmds/quota.tproj/Makefile @@ -1,6 +1,9 @@ PROG= quota MAN= quota.1 +# Setuid this bin +BINMODE=4555 + BINDIR=/usr/bin .include diff --git a/shell_cmds/su/Makefile b/shell_cmds/su/Makefile index 7bc56fb..4466d8d 100644 --- a/shell_cmds/su/Makefile +++ b/shell_cmds/su/Makefile @@ -1,5 +1,8 @@ PROG= su +# Setuid this bin +BINMODE=4555 + LDADD=-lpam -liosexec .include diff --git a/system_cmds/passwd.tproj/Makefile b/system_cmds/passwd.tproj/Makefile index 7dcc91f..3df5677 100644 --- a/system_cmds/passwd.tproj/Makefile +++ b/system_cmds/passwd.tproj/Makefile @@ -3,6 +3,9 @@ MAN= passwd.1 SRCS= file_passwd.c nis_passwd.c od_passwd.c \ pam_passwd.c passwd.c +# Setuid this bin +BINMODE=4555 + LDADD+=-lcrypt .include diff --git a/text_cmds/md5/Makefile b/text_cmds/md5/Makefile index c152154..cb92a5c 100644 --- a/text_cmds/md5/Makefile +++ b/text_cmds/md5/Makefile @@ -3,25 +3,11 @@ SRCS= md5.c commoncrypto.c LINKS= ${BINDIR}/md5 ${BINDIR}/rmd160 \ ${BINDIR}/md5 ${BINDIR}/sha1 \ - ${BINDIR}/md5 ${BINDIR}/sha224 \ - ${BINDIR}/md5 ${BINDIR}/sha256 \ - ${BINDIR}/md5 ${BINDIR}/sha384 \ - ${BINDIR}/md5 ${BINDIR}/sha512 \ - ${BINDIR}/md5 ${BINDIR}/sha512t256 \ - ${BINDIR}/md5 ${BINDIR}/skein256 \ - ${BINDIR}/md5 ${BINDIR}/skein512 \ - ${BINDIR}/md5 ${BINDIR}/skein1024 + ${BINDIR}/md5 ${BINDIR}/sha256 MLINKS= md5.1 rmd160.1 \ md5.1 sha1.1 \ - md5.1 sha224.1 \ - md5.1 sha256.1 \ - md5.1 sha384.1 \ - md5.1 sha512.1 \ - md5.1 sha512t256.1 \ - md5.1 skein256.1 \ - md5.1 skein512.1 \ - md5.1 skein1024.1 + md5.1 sha256.1 BINDIR=/sbin -- cgit v1.2.3-56-ge451