From bba02a5094b3db228ceac41cb4bfca165d0735f3 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Sun, 25 Mar 2018 09:17:33 -0700 Subject: modified: auth-sia.c modified: openbsd-compat/port-aix.c modified: openbsd-compat/port-uw.c propogate changes to auth-passwd.c in commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3 to other providers of sys_auth_passwd() --- openbsd-compat/port-aix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'openbsd-compat/port-aix.c') diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index c2970c4db..768d44c33 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c @@ -171,8 +171,9 @@ aix_valid_authentications(const char *user) * returns 0. */ int -sys_auth_passwd(Authctxt *ctxt, const char *password) +sys_auth_passwd(struct ssh *ssh, const char *password) { + Authctxt *ctxt = ssh->authctxt; char *authmsg = NULL, *msg = NULL, *name = ctxt->pw->pw_name; int authsuccess = 0, expired, reenter, result; -- cgit v1.2.3 From 6b5a17bc14e896e3904dc58d889b58934cfacd24 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 26 Mar 2018 13:12:44 +1100 Subject: Include ssh_api.h for struct ssh. struct ssh is needed by implementations of sys_auth_passwd() that were converted in commit bba02a50. Needed to fix build on AIX, I assume for the other platforms too (although it should be harmless if not needed). --- auth-sia.c | 1 + openbsd-compat/port-aix.c | 1 + openbsd-compat/port-uw.c | 1 + 3 files changed, 3 insertions(+) (limited to 'openbsd-compat/port-aix.c') diff --git a/auth-sia.c b/auth-sia.c index 051d152cf..7c97f03e5 100644 --- a/auth-sia.c +++ b/auth-sia.c @@ -36,6 +36,7 @@ #include #include "ssh.h" +#include "ssh_api.h" #include "key.h" #include "hostfile.h" #include "auth.h" diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index 768d44c33..79c868966 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c @@ -32,6 +32,7 @@ #include "hostfile.h" #include "auth.h" #include "ssh.h" +#include "ssh_api.h" #include "log.h" #ifdef _AIX diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c index ba675acd6..014cac264 100644 --- a/openbsd-compat/port-uw.c +++ b/openbsd-compat/port-uw.c @@ -47,6 +47,7 @@ #include "hostfile.h" #include "auth.h" #include "ssh.h" +#include "ssh_api.h" int nischeck(char *); -- cgit v1.2.3