Eliminate the only setuid perl script in the tree.

Original 'C' progam submitted by Juriy Goloveshkin.
A different 'C' program also submitted by dima.

I merged and rewrote them to include error handling, use getlogin for
user name and only the BSD boilerplate license remained from the
original code.  We also only allow root to get other user's keys.

Review, bikeshed and bdelint(1): myself, kris, dima, markm

4 files changed, 65 insertions, 34 deletions

diff --git a/usr.bin/keyinfo/Makefile b/usr.bin/keyinfo/Makefile
index 1fdd57c..dfe130c 100644
--- a/usr.bin/keyinfo/Makefile
+++ b/usr.bin/keyinfo/Makefile
@@ -1,11 +1,10 @@
 #	@(#)Makefile	5.5 (Berkeley) 7/1/90
+# $FreeBSD$
 
 BINMODE=4555
-
-MAN1=	keyinfo.1
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${.CURDIR}/keyinfo.pl ${DESTDIR}${BINDIR}/keyinfo
+PROG=	keyinfo
+LDFLAGS=-lskey -lcrypt -lmd
+DPADD=	${LIBSKEY} ${LIBCRYPT} ${LIBMD}
+CFLAGS+=-Wall
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/keyinfo/keyinfo.1 b/usr.bin/keyinfo/keyinfo.1
index 7750437..5fcae68 100644
--- a/usr.bin/keyinfo/keyinfo.1
+++ b/usr.bin/keyinfo/keyinfo.1
@@ -27,12 +27,13 @@ Usage example:
 .sp 0
     > keyinfo
 .sp 0
-    0098 ws91340
+    98 ws91340
 .Sh ARGUMENTS
 .Bl -tag -width indent
 .It Ar username
 The S/key user to display the information for.  The default is 
 to display S/Key information on the user who invokes the command.
+Only the superuser can ask for another user's key information.
 .El
 .Sh DIAGNOSTICS
 .Nm Keyinfo
@@ -51,3 +52,4 @@ Rewritten in Perl by
 .el Joerg Wunsch
 so it can be made setuid, and the S/Key keys file can be read-protected
 from the users.
+Rewritten in C by Warner Losh.
diff --git a/usr.bin/keyinfo/keyinfo.c b/usr.bin/keyinfo/keyinfo.c
new file mode 100644
index 0000000..9213a14
--- /dev/null
+++ b/usr.bin/keyinfo/keyinfo.c
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2000 Warner Losh.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/param.h>
+#include <stdio.h>
+#include <skey.h>
+#include <unistd.h>
+#include <err.h>
+
+int
+main(int argc, char *argv[])
+{
+ 	struct skey skey;
+ 	char *login;
+ 	char *name;
+	int serr;
+ 
+ 	login = getlogin();
+ 	if (login == NULL)
+ 		errx(1, "Cannot find login name");
+ 	if (getuid() != 0 && argc > 1 && strcmp(login, argv[1]) != 0)
+ 		errx(1, "Only superuser may get another user's keys");
+ 	name = argc > 1 ? argv[1] : login;
+	serr = skeylookup(&skey, name);
+	if (serr == -1)
+		err(1, "skeylookup os failure");
+ 	fclose(skey.keyfile);
+	if (serr != 0)
+		errx(1, "skeylookup: user %s not found", name);
+ 	printf("%d %s\n", skey.n - 1, skey.seed);
+ 	return (0);
+}
diff --git a/usr.bin/keyinfo/keyinfo.pl b/usr.bin/keyinfo/keyinfo.pl
deleted file mode 100644
index 8316c58..0000000
--- a/usr.bin/keyinfo/keyinfo.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/suidperl
-#
-# Search /etc/skeykeys for the skey string for this user OR user specified
-# in 1st parameter.
-#
-# $FreeBSD$
-#
-
-die "usage: keyinfo [user]\n" unless $#ARGV < 1;
-
-open(K, "/etc/skeykeys") || exit 1;
-
-if ($#ARGV == 0) {
-    $user = $ARGV[0];
-} else {
-    $user = (getpwuid($<))[0];
-}
-
-while (<K>) {
-    ($id, $seq, $serial) = split;
-    if ($id eq $user) {
-	printf "%d %s\n", $seq - 1, $serial;
-	exit 0;
-    }
-}
-exit 1;
-