Some AIX fixes; report from Michael Felt

diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index eabb524937f6cc9e37bb0b6cbdf7b5808b4ce462..943177c708c9b216a94ee6ec98cebf269e91a34f 100644 (file)
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -204,7 +204,7 @@ sys_auth_passwd(struct ssh *ssh, const char *password)
                 */
                expired = passwdexpired(name, &msg);
                if (msg && *msg) {
-                       if ((r = sshbuf_put(ctx->loginmsg,
+                       if ((r = sshbuf_put(ctxt->loginmsg,
                            msg, strlen(msg))) != 0)
                                fatal("%s: buffer error: %s",
                                    __func__, ssh_err(r));
@@ -241,7 +241,7 @@ int
 sys_auth_allowed_user(struct passwd *pw, struct sshbuf *loginmsg)
 {
        char *msg = NULL;
-       int result, permitted = 0;
+       int r, result, permitted = 0;
        struct stat st;
 
        /*
@@ -267,6 +267,7 @@ sys_auth_allowed_user(struct passwd *pw, struct sshbuf *loginmsg)
        else if (msg != NULL) {
                if ((r = sshbuf_put(loginmsg, msg, strlen(msg))) != 0)
                        fatal("%s: buffer error: %s", __func__, ssh_err(r));
+       }
        if (msg == NULL)
                msg = xstrdup("(none)");
        aix_remove_embedded_newlines(msg);