aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2001-11-06 03:51:18 +0000
committerWarner Losh <imp@FreeBSD.org>2001-11-06 03:51:18 +0000
commit474e7788d5248e63a9e8906e3769544cb63fb58b (patch)
treeb5f13cb118757ab54b14eede0dfca74861206a68
parentb393377b2f19f7ae1a55d866e6ee5c94c186dc47 (diff)
downloadsrc-474e7788d5248e63a9e8906e3769544cb63fb58b.tar.gz
src-474e7788d5248e63a9e8906e3769544cb63fb58b.zip
Back out last commit to RELENG_4_3 branch, that was a mistake
Notes
Notes: svn path=/releng/4.3/; revision=86124
-rw-r--r--usr.bin/keyinfo/Makefile10
-rw-r--r--usr.bin/keyinfo/keyinfo.c58
2 files changed, 6 insertions, 62 deletions
diff --git a/usr.bin/keyinfo/Makefile b/usr.bin/keyinfo/Makefile
index a542994f7b7f..f793ad7bc09e 100644
--- a/usr.bin/keyinfo/Makefile
+++ b/usr.bin/keyinfo/Makefile
@@ -1,10 +1,12 @@
# @(#)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
deleted file mode 100644
index c3bf4052f773..000000000000
--- a/usr.bin/keyinfo/keyinfo.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * 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);
-}