diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-plugin.h | 36 | ||||
| -rw-r--r-- | src/include/stock/osconf.h | 4 |
2 files changed, 24 insertions, 16 deletions
diff --git a/src/include/k5-plugin.h b/src/include/k5-plugin.h index c7fb1776ca..5bb9be7a00 100644 --- a/src/include/k5-plugin.h +++ b/src/include/k5-plugin.h @@ -72,8 +72,9 @@ struct plugin_dir_handle { #define PLUGIN_DIR_OPEN(P) ((P)->files != NULL) long KRB5_CALLCONV -krb5int_open_plugin (const char *, struct plugin_file_handle **, - struct errinfo *); +krb5int_open_plugin (const char *, struct plugin_file_handle **, struct errinfo *); +void KRB5_CALLCONV +krb5int_close_plugin (struct plugin_file_handle *); long KRB5_CALLCONV krb5int_get_plugin_data (struct plugin_file_handle *, const char *, void **, @@ -83,18 +84,21 @@ long KRB5_CALLCONV krb5int_get_plugin_func (struct plugin_file_handle *, const char *, void (**)(), struct errinfo *); -void KRB5_CALLCONV -krb5int_close_plugin (struct plugin_file_handle *); -long KRB5_CALLCONV krb5int_open_plugin_dir (const char *, - struct plugin_dir_handle *, - struct errinfo *); -void KRB5_CALLCONV krb5int_close_plugin_dir (struct plugin_dir_handle *); -void KRB5_CALLCONV krb5int_free_plugin_dir_data (void **); -long KRB5_CALLCONV krb5int_get_plugin_dir_data (struct plugin_dir_handle *, - const char *, void ***, - struct errinfo *); -void KRB5_CALLCONV krb5int_free_plugin_dir_func (void (**)(void)); -long KRB5_CALLCONV krb5int_get_plugin_dir_func (struct plugin_dir_handle *, - const char *, void (***)(void), - struct errinfo *); +long KRB5_CALLCONV +krb5int_open_plugin_dirs (const char * const *, const char * const *, + struct plugin_dir_handle *, struct errinfo *); +void KRB5_CALLCONV +krb5int_close_plugin_dirs (struct plugin_dir_handle *); + +long KRB5_CALLCONV +krb5int_get_plugin_dir_data (struct plugin_dir_handle *, const char *, + void ***, struct errinfo *); +void KRB5_CALLCONV +krb5int_free_plugin_dir_data (void **); + +long KRB5_CALLCONV +krb5int_get_plugin_dir_func (struct plugin_dir_handle *, const char *, + void (***)(void), struct errinfo *); +void KRB5_CALLCONV +krb5int_free_plugin_dir_func (void (**)(void)); diff --git a/src/include/stock/osconf.h b/src/include/stock/osconf.h index 03b2ce651d..26a28054e6 100644 --- a/src/include/stock/osconf.h +++ b/src/include/stock/osconf.h @@ -64,7 +64,11 @@ #define DEFAULT_KDC_PROFILE "@LOCALSTATEDIR/krb5kdc/kdc.conf" #define KDC_PROFILE_ENV "KRB5_KDC_PROFILE" +#if TARGET_OS_MAC +#define DEFAULT_KDB_LIB_PATH { KDB5_PLUGIN_BUNDLE_DIR, "@MODULEDIR/kdb", NULL } +#else #define DEFAULT_KDB_LIB_PATH { "@MODULEDIR/kdb", NULL } +#endif #define MODULE_PATH "@MODULEDIR" #define DEFAULT_KDC_ENCTYPE ENCTYPE_DES3_CBC_SHA1 |