From: Tim Rice <tim@multitalents.net>
Date: Sun, 25 Mar 2018 16:17:33 +0000 (-0700)
Subject: 	modified:   auth-sia.c
X-Git-Tag: V_7_7_P1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bba02a5094b3db228ceac41cb4bfca165d0735f3;p=thirdparty%2Fopenssh-portable.git

	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()
---

diff --git a/auth-sia.c b/auth-sia.c
index a9e1c258c..051d152cf 100644
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -50,11 +50,12 @@ extern int saved_argc;
 extern char **saved_argv;
 
 int
-sys_auth_passwd(Authctxt *authctxt, const char *pass)
+sys_auth_passwd(struct ssh *ssh, const char *pass)
 {
 	int ret;
 	SIAENTITY *ent = NULL;
 	const char *host;
+	Authctxt *authctxt = ssh->authctxt;
 
 	host = get_canonical_hostname(options.use_dns);
 
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;
 
diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c
index db24dbb94..ba675acd6 100644
--- a/openbsd-compat/port-uw.c
+++ b/openbsd-compat/port-uw.c
@@ -51,8 +51,9 @@
 int nischeck(char *);
 
 int
-sys_auth_passwd(Authctxt *authctxt, const char *password)
+sys_auth_passwd(struct ssh *ssh, const char *password)
 {
+	Authctxt *authctxt = ssh->authctxt;
 	struct passwd *pw = authctxt->pw;
 	char *salt;
 	int result;