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-monitor.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-monitor.c')
| -rw-r--r-- | security/openssh/files/patch-monitor.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/security/openssh/files/patch-monitor.c b/security/openssh/files/patch-monitor.c new file mode 100644 index 000000000000..fc0f1911ddda --- /dev/null +++ b/security/openssh/files/patch-monitor.c @@ -0,0 +1,36 @@ +--- monitor.c.orig Fri Jun 21 07:50:51 2002 ++++ monitor.c Mon Jun 24 20:39:42 2002 +@@ -30,7 +30,7 @@ + #include <openssl/dh.h> + + #ifdef SKEY +-#include <skey.h> ++#include <opie.h> + #endif + + #include "ssh.h" +@@ -656,11 +656,11 @@ + int + mm_answer_skeyquery(int socket, Buffer *m) + { +- struct skey skey; ++ struct opie opie; + char challenge[1024]; + int res; + +- res = skeychallenge(&skey, authctxt->user, challenge); ++ res = opiechallenge(&opie, authctxt->user, challenge); + + buffer_clear(m); + buffer_put_int(m, res); +@@ -683,8 +683,8 @@ + + authok = (options.challenge_response_authentication && + authctxt->valid && +- skey_haskey(authctxt->pw->pw_name) == 0 && +- skey_passcheck(authctxt->pw->pw_name, response) != -1); ++ opie_haskey(authctxt->pw->pw_name) == 0 && ++ opie_passverify(authctxt->pw->pw_name, response) != -1); + + xfree(response); + |