summaryrefslogtreecommitdiff
path: root/openbsd-compat/port-aix.c
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 /openbsd-compat/port-aix.c
parent2f4766ceefe6657c5ad5fe92d13c411872acae0e (diff)
Some AIX fixes; report from Michael Felt
Diffstat (limited to 'openbsd-compat/port-aix.c')
-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 eabb52493..943177c70 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)
204 */ 204 */
205 expired = passwdexpired(name, &msg); 205 expired = passwdexpired(name, &msg);
206 if (msg && *msg) { 206 if (msg && *msg) {
207 if ((r = sshbuf_put(ctx->loginmsg, 207 if ((r = sshbuf_put(ctxt->loginmsg,
208 msg, strlen(msg))) != 0) 208 msg, strlen(msg))) != 0)
209 fatal("%s: buffer error: %s", 209 fatal("%s: buffer error: %s",
210 __func__, ssh_err(r)); 210 __func__, ssh_err(r));
@@ -241,7 +241,7 @@ int
241sys_auth_allowed_user(struct passwd *pw, struct sshbuf *loginmsg) 241sys_auth_allowed_user(struct passwd *pw, struct sshbuf *loginmsg)
242{ 242{
243 char *msg = NULL; 243 char *msg = NULL;
244 int result, permitted = 0; 244 int r, result, permitted = 0;
245 struct stat st; 245 struct stat st;
246 246
247 /* 247 /*
@@ -267,6 +267,7 @@ sys_auth_allowed_user(struct passwd *pw, struct sshbuf *loginmsg)
267 else if (msg != NULL) { 267 else if (msg != NULL) {
268 if ((r = sshbuf_put(loginmsg, msg, strlen(msg))) != 0) 268 if ((r = sshbuf_put(loginmsg, msg, strlen(msg))) != 0)
269 fatal("%s: buffer error: %s", __func__, ssh_err(r)); 269 fatal("%s: buffer error: %s", __func__, ssh_err(r));
270 }
270 if (msg == NULL) 271 if (msg == NULL)
271 msg = xstrdup("(none)"); 272 msg = xstrdup("(none)");
272 aix_remove_embedded_newlines(msg); 273 aix_remove_embedded_newlines(msg);