summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--auth-pam.c4
-rw-r--r--scard-opensc.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7defe636..d0000785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@
Add examples to ssh-agent.1, bz#481 from Ralf Hauser; ok deraadt@
- (dtucker) [sshd.8] Bug #843: Add warning about PasswordAuthentication to
UsePAM section. Parts from djm@ and jmc@.
+ - (dtucker) [auth-pam.c scard-opensc.c] Tinderbox says auth-pam.c uses
+ readpass.h, grep says scard-opensc.c does too. Replace with misc.h.
20040502
- (dtucker) OpenBSD CVS Sync
@@ -1112,4 +1114,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3352 2004/05/13 06:51:40 dtucker Exp $
+$Id: ChangeLog,v 1.3353 2004/05/13 07:29:35 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 36dbb7e1..faa0b904 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -31,7 +31,7 @@
/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h"
-RCSID("$Id: auth-pam.c,v 1.100 2004/04/18 01:00:26 dtucker Exp $");
+RCSID("$Id: auth-pam.c,v 1.101 2004/05/13 07:29:35 dtucker Exp $");
#ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -49,7 +49,7 @@ RCSID("$Id: auth-pam.c,v 1.100 2004/04/18 01:00:26 dtucker Exp $");
#include "monitor_wrap.h"
#include "msg.h"
#include "packet.h"
-#include "readpass.h"
+#include "misc.h"
#include "servconf.h"
#include "ssh2.h"
#include "xmalloc.h"
diff --git a/scard-opensc.c b/scard-opensc.c
index a9b7ebc6..dd2c28df 100644
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -35,7 +35,7 @@
#include "key.h"
#include "log.h"
#include "xmalloc.h"
-#include "readpass.h"
+#include "misc.h"
#include "scard.h"
#if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE)