diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-pkcs11-helper.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20100314 | ||
2 | - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix | ||
3 | compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot | ||
4 | AT fefe.de | ||
5 | |||
1 | 20100312 | 6 | 20100312 |
2 | - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) | 7 | - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) |
3 | - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets. | 8 | - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets. |
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c index d3bfb9838..8e3f57ace 100644 --- a/ssh-pkcs11-helper.c +++ b/ssh-pkcs11-helper.c | |||
@@ -17,8 +17,6 @@ | |||
17 | 17 | ||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | 19 | ||
20 | #ifdef ENABLE_PKCS11 | ||
21 | |||
22 | #include <sys/types.h> | 20 | #include <sys/types.h> |
23 | #ifdef HAVE_SYS_TIME_H | 21 | #ifdef HAVE_SYS_TIME_H |
24 | # include <sys/time.h> | 22 | # include <sys/time.h> |
@@ -39,6 +37,8 @@ | |||
39 | #include "authfd.h" | 37 | #include "authfd.h" |
40 | #include "ssh-pkcs11.h" | 38 | #include "ssh-pkcs11.h" |
41 | 39 | ||
40 | #ifdef ENABLE_PKCS11 | ||
41 | |||
42 | /* borrows code from sftp-server and ssh-agent */ | 42 | /* borrows code from sftp-server and ssh-agent */ |
43 | 43 | ||
44 | struct pkcs11_keyinfo { | 44 | struct pkcs11_keyinfo { |