diff options
author | Tim Rice <tim@multitalents.net> | 2018-03-25 09:17:33 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2018-03-25 09:17:33 -0700 |
commit | bba02a5094b3db228ceac41cb4bfca165d0735f3 (patch) | |
tree | 4859ff59dd32836f13700e69195dc729a8ef2b87 | |
parent | d7a7a39168bdfe273587bf85d779d60569100a3f (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.c | 3 | ||||
-rw-r--r-- | openbsd-compat/port-aix.c | 3 | ||||
-rw-r--r-- | openbsd-compat/port-uw.c | 3 |
3 files changed, 6 insertions, 3 deletions
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; | |||
50 | extern char **saved_argv; | 50 | extern char **saved_argv; |
51 | 51 | ||
52 | int | 52 | int |
53 | sys_auth_passwd(Authctxt *authctxt, const char *pass) | 53 | sys_auth_passwd(struct ssh *ssh, const char *pass) |
54 | { | 54 | { |
55 | int ret; | 55 | int ret; |
56 | SIAENTITY *ent = NULL; | 56 | SIAENTITY *ent = NULL; |
57 | const char *host; | 57 | const char *host; |
58 | Authctxt *authctxt = ssh->authctxt; | ||
58 | 59 | ||
59 | host = get_canonical_hostname(options.use_dns); | 60 | host = get_canonical_hostname(options.use_dns); |
60 | 61 | ||
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) | |||
171 | * returns 0. | 171 | * returns 0. |
172 | */ | 172 | */ |
173 | int | 173 | int |
174 | sys_auth_passwd(Authctxt *ctxt, const char *password) | 174 | sys_auth_passwd(struct ssh *ssh, const char *password) |
175 | { | 175 | { |
176 | Authctxt *ctxt = ssh->authctxt; | ||
176 | char *authmsg = NULL, *msg = NULL, *name = ctxt->pw->pw_name; | 177 | char *authmsg = NULL, *msg = NULL, *name = ctxt->pw->pw_name; |
177 | int authsuccess = 0, expired, reenter, result; | 178 | int authsuccess = 0, expired, reenter, result; |
178 | 179 | ||
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 @@ | |||
51 | int nischeck(char *); | 51 | int nischeck(char *); |
52 | 52 | ||
53 | int | 53 | int |
54 | sys_auth_passwd(Authctxt *authctxt, const char *password) | 54 | sys_auth_passwd(struct ssh *ssh, const char *password) |
55 | { | 55 | { |
56 | Authctxt *authctxt = ssh->authctxt; | ||
56 | struct passwd *pw = authctxt->pw; | 57 | struct passwd *pw = authctxt->pw; |
57 | char *salt; | 58 | char *salt; |
58 | int result; | 59 | int result; |