diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-06-24 21:13:06 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-06-24 21:13:06 +0000 |
| commit | 499707792a06b5da6a172581a313c3a0ef69806b (patch) | |
| tree | f60b30dcf7200e30ccb95bca2e280b78e0e243c8 /security/openssh/files/patch-auth-skey.c | |
| parent | PERL -> REINPLACE_CMD. (diff) | |
Merge PAM-changes from openssh currrent
Fix build with SKEY=yes, pr# 36119
Cleanup pw_expire handling.
Add missing includes
Changes defaults to: PermitRootLogin=no, UsePrivilegeSeparation=no
Use $PREFIX/etc/ssh for config, updating manpages too.
Notes
Notes:
svn path=/head/; revision=61893
Diffstat (limited to 'security/openssh/files/patch-auth-skey.c')
| -rw-r--r-- | security/openssh/files/patch-auth-skey.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/security/openssh/files/patch-auth-skey.c b/security/openssh/files/patch-auth-skey.c new file mode 100644 index 000000000000..4ed5d6b47d69 --- /dev/null +++ b/security/openssh/files/patch-auth-skey.c @@ -0,0 +1,36 @@ +--- auth-skey.c.orig Wed Jun 19 02:27:55 2002 ++++ auth-skey.c Mon Jun 24 20:35:50 2002 +@@ -26,7 +26,7 @@ + + #ifdef SKEY + +-#include <skey.h> ++#include <opie.h> + + #include "xmalloc.h" + #include "auth.h" +@@ -45,9 +45,11 @@ + Authctxt *authctxt = ctx; + char challenge[1024], *p; + int len; +- struct skey skey; ++ struct opie opie; + +- if (skeychallenge(&skey, authctxt->user, challenge) == -1) ++ if (opie_haskey(authctxt->user) != 0) ++ return -1; ++ if (opiechallenge(&opie, authctxt->user, challenge) == -1) + return -1; + + *name = xstrdup(""); +@@ -73,8 +75,8 @@ + + if (authctxt->valid && + numresponses == 1 && +- skey_haskey(authctxt->pw->pw_name) == 0 && +- skey_passcheck(authctxt->pw->pw_name, responses[0]) != -1) ++ opie_haskey(authctxt->pw->pw_name) == 0 && ++ opie_passverify(authctxt->pw->pw_name, responses[0]) != -1) + return 0; + return -1; + } |