summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2018-08-11 18:08:45 -0700
committerDamien Miller <djm@mindrot.org>2018-08-11 18:08:45 -0700
commite36a5f61b0f5bebf6d49c215d228cd99dfe86e28 (patch)
tree42b5e4b959a4cc65f9fc6e4049b9bd1b04298e55
parent2f4766ceefe6657c5ad5fe92d13c411872acae0e (diff)
Some AIX fixes; report from Michael Felt
-rw-r--r--openbsd-compat/port-aix.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index eabb5249..943177c7 100644
--- 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);