diff options
Diffstat (limited to 'src/lib/krb5')
| -rw-r--r-- | src/lib/krb5/os/init_os_ctx.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/os/locate_kdc.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index e91a05ff1..866038940 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -481,7 +481,7 @@ krb5_os_free_context(krb5_context ctx) ctx->profile = 0; } - krb5int_close_plugin_dir (&ctx->libkrb5_plugins); + krb5int_close_plugin_dirs (&ctx->libkrb5_plugins); #ifdef _WIN32 WSACleanup(); diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c index 83b006634..979337a35 100644 --- a/src/lib/krb5/os/locate_kdc.c +++ b/src/lib/krb5/os/locate_kdc.c @@ -545,10 +545,10 @@ krb5_locate_srv_dns_1 (const krb5_data *realm, #include "k5-locate.h" -#ifdef KFM_FRAMEWORK_PLUGIN_DIR -static const char objdir[] = KFM_FRAMEWORK_PLUGIN_DIR ; +#if TARGET_OS_MAC +static const char *objdirs[] = { KRB5_PLUGIN_BUNDLE_DIR, LIBDIR "/krb5/plugins/libkrb5", NULL }; /* should be a list */ #else -static const char objdir[] = LIBDIR "/krb5/plugins/libkrb5"; +static const char *objdirs[] = { LIBDIR "/krb5/plugins/libkrb5", NULL }; #endif struct module_callback_data { @@ -612,8 +612,9 @@ module_locate_server (krb5_context ctx, const krb5_data *realm, Tprintf("in module_locate_server\n"); cbdata.lp = addrlist; if (!PLUGIN_DIR_OPEN (&ctx->libkrb5_plugins)) { - code = krb5int_open_plugin_dir (objdir, &ctx->libkrb5_plugins, - &ctx->err); + + code = krb5int_open_plugin_dirs (objdirs, NULL, &ctx->libkrb5_plugins, + &ctx->err); if (code) return KRB5_PLUGIN_NO_HANDLE; } |