From 5de6ac2bad11175135d9b819b3546db0ca0b4878 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 21 Jan 2019 11:44:19 +1100
Subject: remove HAVE_DLOPEN that snuck in

portable doesn't use this
---
 ssh-pkcs11.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'ssh-pkcs11.c')

diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 2b65010c..41992ceb 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -78,7 +78,6 @@ struct pkcs11_key {
 
 int pkcs11_interactive = 0;
 
-#ifdef HAVE_DLOPEN
 static void
 ossl_error(const char *msg)
 {
@@ -88,7 +87,6 @@ ossl_error(const char *msg)
 		error("%s: %s: %.100s", __func__, msg,
 		    ERR_error_string(e, NULL));
 }
-#endif
 
 int
 pkcs11_init(int interactive)
@@ -1675,7 +1673,7 @@ out:
 	return (k);
 }
 #endif /* WITH_PKCS11_KEYGEN */
-#else /* HAVE_DLOPEN */
+#else /* ENABLE_PKCS11 */
 int
 pkcs11_init(int interactive)
 {
@@ -1695,4 +1693,4 @@ pkcs11_terminate(void)
 {
 	error("%s: dlopen() not supported", __func__);
 }
-#endif /* HAVE_DLOPEN */
+#endif /* ENABLE_PKCS11 */
-- 
cgit v1.2.1