diff options
| author | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
| commit | 0f31b02d696704321e4e94e63dceff52599ab808 (patch) | |
| tree | 953c18ea1e163d5ebd4b0d153b6378646ff41808 /crypto/openssh/readpass.c | |
| parent | 5080a59fa0c3561940d69fe29dc75ac489f0183a (diff) | |
| download | FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.zip FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.tar.gz | |
MFS (r296781):
MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug)
MFH (r296634): re-add aes-cbc to server-side default cipher list
MFH (r296651, r296657): fix gcc build of pam_ssh
PR: 207679
Security: CVE-2016-3115
Approved by: re (marius)
Diffstat (limited to 'crypto/openssh/readpass.c')
| -rw-r--r-- | crypto/openssh/readpass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/readpass.c b/crypto/openssh/readpass.c index 869d864..05c8cac 100644 --- a/crypto/openssh/readpass.c +++ b/crypto/openssh/readpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readpass.c,v 1.50 2014/02/02 03:44:31 djm Exp $ */ +/* $OpenBSD: readpass.c,v 1.51 2015/12/11 00:20:04 mmcc Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -76,7 +76,7 @@ ssh_askpass(char *askpass, const char *msg) close(p[0]); if (dup2(p[1], STDOUT_FILENO) < 0) fatal("ssh_askpass: dup2: %s", strerror(errno)); - execlp(askpass, askpass, msg, (char *) 0); + execlp(askpass, askpass, msg, (char *)NULL); fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno)); } close(p[1]); |
