diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-pam.c | 4 | ||||
-rw-r--r-- | scard-opensc.c | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -36,6 +36,8 @@ | |||
36 | Add examples to ssh-agent.1, bz#481 from Ralf Hauser; ok deraadt@ | 36 | Add examples to ssh-agent.1, bz#481 from Ralf Hauser; ok deraadt@ |
37 | - (dtucker) [sshd.8] Bug #843: Add warning about PasswordAuthentication to | 37 | - (dtucker) [sshd.8] Bug #843: Add warning about PasswordAuthentication to |
38 | UsePAM section. Parts from djm@ and jmc@. | 38 | UsePAM section. Parts from djm@ and jmc@. |
39 | - (dtucker) [auth-pam.c scard-opensc.c] Tinderbox says auth-pam.c uses | ||
40 | readpass.h, grep says scard-opensc.c does too. Replace with misc.h. | ||
39 | 41 | ||
40 | 20040502 | 42 | 20040502 |
41 | - (dtucker) OpenBSD CVS Sync | 43 | - (dtucker) OpenBSD CVS Sync |
@@ -1112,4 +1114,4 @@ | |||
1112 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1114 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1113 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1115 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1114 | 1116 | ||
1115 | $Id: ChangeLog,v 1.3352 2004/05/13 06:51:40 dtucker Exp $ | 1117 | $Id: ChangeLog,v 1.3353 2004/05/13 07:29:35 dtucker Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 36dbb7e15..faa0b904f 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ |
33 | #include "includes.h" | 33 | #include "includes.h" |
34 | RCSID("$Id: auth-pam.c,v 1.100 2004/04/18 01:00:26 dtucker Exp $"); | 34 | RCSID("$Id: auth-pam.c,v 1.101 2004/05/13 07:29:35 dtucker Exp $"); |
35 | 35 | ||
36 | #ifdef USE_PAM | 36 | #ifdef USE_PAM |
37 | #if defined(HAVE_SECURITY_PAM_APPL_H) | 37 | #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 $"); | |||
49 | #include "monitor_wrap.h" | 49 | #include "monitor_wrap.h" |
50 | #include "msg.h" | 50 | #include "msg.h" |
51 | #include "packet.h" | 51 | #include "packet.h" |
52 | #include "readpass.h" | 52 | #include "misc.h" |
53 | #include "servconf.h" | 53 | #include "servconf.h" |
54 | #include "ssh2.h" | 54 | #include "ssh2.h" |
55 | #include "xmalloc.h" | 55 | #include "xmalloc.h" |
diff --git a/scard-opensc.c b/scard-opensc.c index a9b7ebc61..dd2c28df2 100644 --- a/scard-opensc.c +++ b/scard-opensc.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "key.h" | 35 | #include "key.h" |
36 | #include "log.h" | 36 | #include "log.h" |
37 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
38 | #include "readpass.h" | 38 | #include "misc.h" |
39 | #include "scard.h" | 39 | #include "scard.h" |
40 | 40 | ||
41 | #if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE) | 41 | #if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE) |