From 1c8cae58ccef6b646195940e7ca733d1c2ab7fab Mon Sep 17 00:00:00 2001
From: Gary Lockyer <gary@catalyst.net.nz>
Date: Mon, 25 Sep 2017 13:58:10 +1300
Subject: [PATCH] heimdal: Use #ifdef HAVE_DLOPEN around functions and
 variables used by HAVE_DLOPEN

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
---
 lib/gssapi/mech/gss_mech_switch.c | 4 ++++
 lib/krb5/plugin.c                 | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/lib/gssapi/mech/gss_mech_switch.c b/lib/gssapi/mech/gss_mech_switch.c
index 58b187eda..dab2978b5 100644
--- a/lib/gssapi/mech/gss_mech_switch.c
+++ b/lib/gssapi/mech/gss_mech_switch.c
@@ -37,6 +37,7 @@ struct _gss_mech_switch_list _gss_mechs = { NULL } ;
 gss_OID_set _gss_mech_oids;
 static HEIMDAL_MUTEX _gss_mech_mutex = HEIMDAL_MUTEX_INITIALIZER;
 
+#ifdef HAVE_DLOPEN
 /*
  * Convert a string containing an OID in 'dot' form
  * (e.g. 1.2.840.113554.1.2.2) to a gss_OID.
@@ -148,6 +149,7 @@ _gss_string_to_oid(const char* s, gss_OID oid)
 
 	return (0);
 }
+#endif
 
 #define SYM(name)							\
 do {									\
@@ -227,6 +229,7 @@ void
 _gss_load_mech(void)
 {
 	OM_uint32	major_status, minor_status;
+#ifdef HAVE_DLOPEN
 	FILE		*fp;
 	char		buf[256];
 	char		*p;
@@ -235,6 +238,7 @@ _gss_load_mech(void)
 	void		*so;
 	gss_OID_desc	mech_oid;
 	int		found;
+#endif
 
 
 	HEIMDAL_MUTEX_lock(&_gss_mech_mutex);
diff --git a/lib/krb5/plugin.c b/lib/krb5/plugin.c
index 03f64000f..8a7b85c0e 100644
--- a/lib/krb5/plugin.c
+++ b/lib/krb5/plugin.c
@@ -209,6 +209,8 @@ struct plugin2 {
     heim_dict_t names;
 };
 
+#ifdef HAVE_DLOPEN
+
 static void
 plug_dealloc(void *ptr)
 {
@@ -258,6 +260,7 @@ resolve_origin(const char *di)
 #endif /* !HAVE_DLADDR */
 }
 
+#endif /* HAVE_DLOPEN */
 
 /**
  * Load plugins (new system) for the given module @name (typically