From 3587b8c08c8a119031c17b29bfe5d0f552bb39f8 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 9 Aug 2021 11:45:53 +1200 Subject: [PATCH] Allow _gss_string_to_oid() without HAVE_DLOPEN This function became used outside the protection of HAVE_DLOPEN (which Samba sets) with: commit 5966c00701d9045fb5440a0d15c14a02cfd99f01 Author: Luke Howard Date: Sun Aug 8 10:34:28 2021 +1000 gss: add gss_mg_name_to_oid internal API Add a new function for future internal use, gss_mg_name_to_oid(), which takes either a dot-separated OID or a "short" mechanism name (such as "sanon-x25519"), and returns a mechanism OID. Signed-off-by: Andrew Bartlett --- lib/gssapi/mech/gss_mech_switch.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/gssapi/mech/gss_mech_switch.c b/lib/gssapi/mech/gss_mech_switch.c index 0102a233f..19a0824ea 100644 --- a/lib/gssapi/mech/gss_mech_switch.c +++ b/lib/gssapi/mech/gss_mech_switch.c @@ -37,7 +37,6 @@ struct _gss_mech_switch_list _gss_mechs = { NULL, 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. @@ -160,7 +159,6 @@ _gss_string_to_oid(const char* s, gss_OID *oidp) return (0); } -#endif #define SYM(name) \ do { \