diff options
| author | Damien Miller <djm@mindrot.org> | 2010-03-14 08:37:49 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-03-14 08:37:49 +1100 |
| commit | 47f9a4106a417d57ff784b3a7fcffb803d6df56d (patch) | |
| tree | 9844cbb0a67c04767cf24d30f10a7ffc6c52afb7 | |
| parent | 4e0cea82dd75199c4a4f59165b1971d0d7c45919 (diff) | |
- (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot
AT fefe.de
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ssh-pkcs11-helper.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +20100314 + - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix + compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot + AT fefe.de + 20100312 - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets. diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c index d3bfb983..8e3f57ac 100644 --- a/ssh-pkcs11-helper.c +++ b/ssh-pkcs11-helper.c @@ -17,8 +17,6 @@ #include "includes.h" -#ifdef ENABLE_PKCS11 - #include <sys/types.h> #ifdef HAVE_SYS_TIME_H # include <sys/time.h> @@ -39,6 +37,8 @@ #include "authfd.h" #include "ssh-pkcs11.h" +#ifdef ENABLE_PKCS11 + /* borrows code from sftp-server and ssh-agent */ struct pkcs11_keyinfo { |