RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-22 10:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix

Browse Source 
compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot
   AT fefe.de
This commit is contained in:
Damien Miller 2010-03-14 08:37:49 +11:00
parent 4e0cea82dd
commit 47f9a4106a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 20100312
- (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir)
- (tim) [Makefile.in] Add missing $(EXEEXT) to install targets. - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets.

4
ssh-pkcs11-helper.c
View File

@ -17,8 +17,6 @@
#include "includes.h" #include "includes.h"
#ifdef ENABLE_PKCS11
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
# include <sys/time.h> # include <sys/time.h>
@ -39,6 +37,8 @@
#include "authfd.h" #include "authfd.h"
#include "ssh-pkcs11.h" #include "ssh-pkcs11.h"
#ifdef ENABLE_PKCS11
/* borrows code from sftp-server and ssh-agent */ /* borrows code from sftp-server and ssh-agent */
struct pkcs11_keyinfo { struct pkcs11_keyinfo {