summaryrefslogtreecommitdiffstats
path: root/usr.bin/keyinit
diff options
context:
space:
mode:
authorpst <pst@FreeBSD.org>1994-10-19 00:03:45 +0000
committerpst <pst@FreeBSD.org>1994-10-19 00:03:45 +0000
commit3bbaa5903cdfa6d903256d9ad37d1d8c20c79437 (patch)
tree18581614639f8a987cdf2526bd645ecfdd38abd3 /usr.bin/keyinit
parent1552617ffdcabd5ebae23058e72580c06f45e182 (diff)
downloadFreeBSD-src-3bbaa5903cdfa6d903256d9ad37d1d8c20c79437.zip
FreeBSD-src-3bbaa5903cdfa6d903256d9ad37d1d8c20c79437.tar.gz
Include most of the logdaemon v4.4 S/key changes
Diffstat (limited to 'usr.bin/keyinit')
-rw-r--r--usr.bin/keyinit/Makefile13
-rw-r--r--usr.bin/keyinit/skeyinit.c11
2 files changed, 7 insertions, 17 deletions
diff --git a/usr.bin/keyinit/Makefile b/usr.bin/keyinit/Makefile
index a716f14..a9ed54e 100644
--- a/usr.bin/keyinit/Makefile
+++ b/usr.bin/keyinit/Makefile
@@ -1,20 +1,13 @@
-
# @(#)Makefile 5.6 (Berkeley) 3/5/91
#
-
PROG= keyinit
MAN1= keyinit.1
-DPADD= /usr/bin/libskey.a
-LDADD= -lskey
-
-.if exists(/usr/lib/libcrypt.a)
-DPADD+= ${LIBCRYPT}
-LDADD+= -lcrypt
-.endif
-
SRCS= skeyinit.c
BINOWN= root
BINMODE=4555
+DPADD= ${LIBSKEY} ${LIBMD}
+LDADD= -lskey -lmd
+
.include <bsd.prog.mk>
diff --git a/usr.bin/keyinit/skeyinit.c b/usr.bin/keyinit/skeyinit.c
index 7c8e5d6..5dfd1b1 100644
--- a/usr.bin/keyinit/skeyinit.c
+++ b/usr.bin/keyinit/skeyinit.c
@@ -4,17 +4,15 @@
#include <stdio.h>
#include <string.h>
#include <pwd.h>
-#include <skey.h>
#include <time.h>
+#include <skey.h>
+
extern int optind;
extern char *optarg;
-char * readpass();
-
-int skeylookup __P((struct skey *mp,char *name));
-
#define NAMELEN 2
+
int
main(argc,argv)
int argc;
@@ -103,7 +101,7 @@ char *argv[];
printf("Reminder you need the 6 english words from the skey command.\n");
for(i=0;;i++){
if(i >= 2) exit(1);
- printf("Enter sequence count from 1 to 10000: ");
+ printf("Enter sequence count from 1 to 9999: ");
fgets(tmp,sizeof(tmp),stdin);
n = atoi(tmp);
if(n > 0 && n < 10000)
@@ -126,7 +124,6 @@ char *argv[];
printf("s/key %d %s\ns/key access password: ",n,seed);
fgets(tmp,sizeof(tmp),stdin);
rip(tmp);
- backspace(tmp);
if(tmp[0] == '?'){
printf("Enter 6 English words from secure S/Key calculation.\n");
continue;
OpenPOWER on IntegriCloud