summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth-pam.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 59ac3ad54..61bf3b852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120060318
2- (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
3 elad AT NetBSD.org
4
120060316 520060316
2 - (dtucker) [entropy.c] Add headers for WIFEXITED and friends. 6 - (dtucker) [entropy.c] Add headers for WIFEXITED and friends.
3 - (dtucker) [configure.ac md-sha256.c] NetBSD has sha2.h in 7 - (dtucker) [configure.ac md-sha256.c] NetBSD has sha2.h in
@@ -4182,4 +4186,4 @@
4182 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4186 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4183 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4187 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4184 4188
4185$Id: ChangeLog,v 1.4228 2006/03/16 07:22:18 djm Exp $ 4189$Id: ChangeLog,v 1.4229 2006/03/18 12:04:49 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 49cf32369..2d975c394 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -47,7 +47,7 @@
47 47
48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ 48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
49#include "includes.h" 49#include "includes.h"
50RCSID("$Id: auth-pam.c,v 1.129 2006/03/15 03:42:55 djm Exp $"); 50RCSID("$Id: auth-pam.c,v 1.130 2006/03/18 12:04:49 djm Exp $");
51 51
52#include <sys/types.h> 52#include <sys/types.h>
53#include <sys/stat.h> 53#include <sys/stat.h>
@@ -729,6 +729,7 @@ sshpam_query(void *ctx, char **name, char **info,
729 *num = 0; 729 *num = 0;
730 **echo_on = 0; 730 **echo_on = 0;
731 ctxt->pam_done = -1; 731 ctxt->pam_done = -1;
732 xfree(msg);
732 return 0; 733 return 0;
733 } 734 }
734 /* FALLTHROUGH */ 735 /* FALLTHROUGH */