diff options
author | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
commit | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (patch) | |
tree | 13e783343edf688afffb4a8e02dc9685342b98a6 /ssh-pkcs11-helper.c | |
parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) | |
parent | ff0095389ba9a9e4599e6051c8d5bae6777c4d64 (diff) |
merge 5.5p1
Diffstat (limited to 'ssh-pkcs11-helper.c')
-rw-r--r-- | ssh-pkcs11-helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |