mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-21 20:38:45 +00:00
499707792a
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.
37 lines
880 B
C
37 lines
880 B
C
--- 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;
|
|
}
|