aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2001-11-05 18:31:23 +0000
committerWarner Losh <imp@FreeBSD.org>2001-11-05 18:31:23 +0000
commitb393377b2f19f7ae1a55d866e6ee5c94c186dc47 (patch)
tree75dcacd8ded9e355ae682bed87a5db4617a49720
parent245604c3ecdd03b52fde2b9127f48c2adce57478 (diff)
downloadsrc-b393377b2f19f7ae1a55d866e6ee5c94c186dc47.tar.gz
src-b393377b2f19f7ae1a55d866e6ee5c94c186dc47.zip
MFC keyinfo.c to eliminate a setuid perl script in -stable
Notes
Notes: svn path=/releng/4.3/; revision=86088
-rw-r--r--usr.bin/keyinfo/Makefile11
-rw-r--r--usr.bin/keyinfo/keyinfo.c58
-rw-r--r--usr.bin/keyinfo/keyinfo.pl27
3 files changed, 63 insertions, 33 deletions
diff --git a/usr.bin/keyinfo/Makefile b/usr.bin/keyinfo/Makefile
index 1fdd57cdf742..a542994f7b7f 100644
--- a/usr.bin/keyinfo/Makefile
+++ b/usr.bin/keyinfo/Makefile
@@ -1,11 +1,10 @@
# @(#)Makefile 5.5 (Berkeley) 7/1/90
+# $FreeBSD$
+PROG= keyinfo
+CFLAGS+=-Wall
+DPADD= ${LIBSKEY} ${LIBCRYPT} ${LIBMD}
+LDADD= -lskey -lcrypt -lmd
BINMODE=4555
-MAN1= keyinfo.1
-
-beforeinstall:
- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- ${.CURDIR}/keyinfo.pl ${DESTDIR}${BINDIR}/keyinfo
-
.include <bsd.prog.mk>
diff --git a/usr.bin/keyinfo/keyinfo.c b/usr.bin/keyinfo/keyinfo.c
new file mode 100644
index 000000000000..c3bf4052f773
--- /dev/null
+++ b/usr.bin/keyinfo/keyinfo.c
@@ -0,0 +1,58 @@
+/*-
+ * 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 <string.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 8316c5896505..000000000000
--- 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;
-