tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some AIX fixes; report from Michael Felt

This commit is contained in:
Damien Miller 2018-08-11 18:08:45 -07:00
parent 2f4766ceef
commit e36a5f61b0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openbsd-compat/port-aix.c
View File

@ -204,7 +204,7 @@ sys_auth_passwd(struct ssh *ssh, const char *password)
*/ */
expired = passwdexpired(name, &msg); expired = passwdexpired(name, &msg);
if (msg && *msg) { if (msg && *msg) {
if ((r = sshbuf_put(ctx->loginmsg, if ((r = sshbuf_put(ctxt->loginmsg,
msg, strlen(msg))) != 0) msg, strlen(msg))) != 0)
fatal("%s: buffer error: %s", fatal("%s: buffer error: %s",
__func__, ssh_err(r)); __func__, ssh_err(r));
@ -241,7 +241,7 @@ int
sys_auth_allowed_user(struct passwd *pw, struct sshbuf *loginmsg) sys_auth_allowed_user(struct passwd *pw, struct sshbuf *loginmsg)
{ {
char *msg = NULL; char *msg = NULL;
int result, permitted = 0; int r, result, permitted = 0;
struct stat st; struct stat st;
/* /*
@ -267,6 +267,7 @@ sys_auth_allowed_user(struct passwd *pw, struct sshbuf *loginmsg)
else if (msg != NULL) { else if (msg != NULL) {
if ((r = sshbuf_put(loginmsg, msg, strlen(msg))) != 0) if ((r = sshbuf_put(loginmsg, msg, strlen(msg))) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r)); fatal("%s: buffer error: %s", __func__, ssh_err(r));
}
if (msg == NULL) if (msg == NULL)
msg = xstrdup("(none)"); msg = xstrdup("(none)");
aix_remove_embedded_newlines(msg); aix_remove_embedded_newlines(msg);