Replace skeyinfo.sh with a setuid binary (necessary for mode 0600 /etc/skeykeys)

3 files changed, 2 insertions, 43 deletions

diff --git a/usr.bin/skey/Makefile b/usr.bin/skey/Makefile
index f112db4c8de..2563fa06ba9 100644
--- a/usr.bin/skey/Makefile
+++ b/usr.bin/skey/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.10 1997/07/17 05:48:39 millert Exp $
+# $OpenBSD: Makefile,v 1.11 1997/07/23 04:10:50 millert Exp $
 
 PROG=	skey
-MAN=	skey.1 skeyinfo.1 skeyaudit.1 skeyprune.8
+MAN=	skey.1 skeyaudit.1 skeyprune.8
 LINKS=	${BINDIR}/skey ${BINDIR}/otp-md4 \
 	${BINDIR}/skey ${BINDIR}/otp-md5 \
 	${BINDIR}/skey ${BINDIR}/otp-sha1 \
@@ -16,8 +16,6 @@ LDADD=	-lskey
 beforeinstall:
 	${INSTALL} ${INSTALL_COPY} -m 755 ${.CURDIR}/skeyaudit.sh \
 		${DESTDIR}${BINDIR}/skeyaudit
-	${INSTALL} ${INSTALL_COPY} -m 755 ${.CURDIR}/skeyinfo.sh \
-		${DESTDIR}${BINDIR}/skeyinfo
 	${INSTALL} ${INSTALL_COPY} -m 755 ${.CURDIR}/skeyprune.pl \
 		${DESTDIR}${BINDIR}/skeyprune
 
diff --git a/usr.bin/skey/skeyinfo.1 b/usr.bin/skey/skeyinfo.1
deleted file mode 100644
index 8cc6630c2c5..00000000000
--- a/usr.bin/skey/skeyinfo.1
+++ /dev/null
@@ -1,24 +0,0 @@
-.\" $OpenBSD: skeyinfo.1,v 1.4 1996/10/08 01:20:56 michaels Exp $
-.\"
-.\"
-.Dd 9 June 1994
-.Dt SKEYINFO 1
-.Os
-.Sh NAME
-.Nm skeyinfo
-.Nd obtain the next S/Key challenge for a user
-.Sh SYNOPSIS
-.Nm skeyinfo
-.Op Ar user
-.Sh DESCRIPTION
-.Nm skeyinfo
-prints out the next S/Key challenge for the specified user or for the
-current user if no user is specified.
-.Sh EXAMPLE
-% skey -n <number of passwords to print> `skeyinfo` | lpr
-.sp
-This would print out a list of S/Key passwords for use over
-an untrusted network (perhaps for use at a conference).
-.Sh SEE ALSO
-.Xr skeyinit 1 ,
-.Xr skey 1
diff --git a/usr.bin/skey/skeyinfo.sh b/usr.bin/skey/skeyinfo.sh
deleted file mode 100644
index 33b0b00673b..00000000000
--- a/usr.bin/skey/skeyinfo.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $OpenBSD: skeyinfo.sh,v 1.4 1996/09/29 04:46:17 millert Exp $
-# search /etc/skeykeys for the skey string for
-# this user OR user specified in 1st parameter
-
-KEYDB=/etc/skeykeys
-if [ -z "$1" ]; then
-	WHO=`/usr/bin/whoami`
-else
-	WHO=$1
-fi
-
-if [ -f $KEYDB ]; then
-	/usr/bin/awk '/^'$WHO'[ 	]/ { if ($2 ~ /^[A-z]/) { print $3-1, $4} else { print $2-1, $3 } }' < $KEYDB
-fi