summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2002-03-20 22:02:02 +0000
committerdes <des@FreeBSD.org>2002-03-20 22:02:02 +0000
commit8528b8bd5786d171be58abcaa0847c0bed964985 (patch)
tree056115cd75d479b1926154d42e40edba579b3bd2 /crypto
parent96546f4f91c1dce7fee00e11a79e85c70f33ab41 (diff)
downloadFreeBSD-src-8528b8bd5786d171be58abcaa0847c0bed964985.zip
FreeBSD-src-8528b8bd5786d171be58abcaa0847c0bed964985.tar.gz
- Change the prompt from "S/Key Password: " to "OPIE Password: "
- If the user doesn't have an OPIE key, don't challenge him. This is a workaround until I get PAM to work properly with ssh2. Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssh/auth-skey.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssh/auth-skey.c b/crypto/openssh/auth-skey.c
index f649ac8..b538b39 100644
--- a/crypto/openssh/auth-skey.c
+++ b/crypto/openssh/auth-skey.c
@@ -38,7 +38,7 @@ skey_init_ctx(Authctxt *authctxt)
return authctxt;
}
-#define PROMPT "\nS/Key Password: "
+#define PROMPT "\nOPIE Password: "
static int
skey_query(void *ctx, char **name, char **infotxt,
@@ -49,6 +49,8 @@ skey_query(void *ctx, char **name, char **infotxt,
int len;
struct opie opie;
+ if (opie_haskey(authctxt->user) != 0)
+ return -1;
if (opiechallenge(&opie, authctxt->user, challenge) == -1)
return -1;
OpenPOWER on IntegriCloud