Call for testing: OpenSSH 7.8

Damien Miller
2018-08-10T20:29:55Z

On Fri, 10 Aug 2018, Michael Felt wrote:

> On 10/08/2018 03:16, Damien Miller wrote:
> > OpenSSH 7.8p1 is almost ready for release, so we would appreciate
testing
> > on as many platforms and systems as possible. This is a bugfix
release.
> I am getting a build error. But this is also a new build system - based
> on AIX 6.1 rather than AIX 5.3.
> Will research asap.

[snip]

> "port-aix.c", line 207.45: 1506-045 (S) Undeclared identifier
ctx.
> "port-aix.c", line 268.22: 1506-045 (S) Undeclared identifier r.
> "port-aix.c", line 479.18: 1506-204 (S) Unexpected end of file.

these look like real errors. Please try this:

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);