summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2018-03-25 09:17:33 -0700
committerTim Rice <tim@multitalents.net>2018-03-25 09:17:33 -0700
commitbba02a5094b3db228ceac41cb4bfca165d0735f3 (patch)
tree4859ff59dd32836f13700e69195dc729a8ef2b87
parentd7a7a39168bdfe273587bf85d779d60569100a3f (diff)
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()
-rw-r--r--auth-sia.c3
-rw-r--r--openbsd-compat/port-aix.c3
-rw-r--r--openbsd-compat/port-uw.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/auth-sia.c b/auth-sia.c
index a9e1c258..051d152c 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 c2970c4d..768d44c3 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 db24dbb9..ba675acd 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;