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 a9e1c258ca61ec6c302e962aa1de2c8eda4d85dd..051d152cfe0518310bf7690aa62d1e6dad692b82 100644 (file)
--- 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 c2970c4db8c7f70ca8498adf7767ea05dbfa5ea0..768d44c33215a1628dfd21b239e51a31e8bb1840 100644 (file)
--- 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 db24dbb94414a1c3d9eff84825a587069bf926d9..ba675acd6c4f6391f56c9c711dea420120c6a5d1 100644 (file)
--- 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;