diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 13 | ||||
| -rw-r--r-- | src/include/k5-int.h | 13 | ||||
| -rw-r--r-- | src/include/krb5.hin | 8 |
3 files changed, 23 insertions, 11 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index d0ea27f22e..a8e7726f5e 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,16 @@ +2003-03-06 Alexandra Ellwood <lxs@mit.edu> + + * krb5.h: Removed enumsalwaysint because there are no typed + enums in this header. + + * k5-int.h: Removed Mac OS header goober. Added prototype for + os_get_default_config_files which will be used by KfM's + preference APIs (KFM needs to get the secure default files as + well as the normal ones). Moved profile.h inclusion higher so + it gets included before this function and thus its types are + defined (the reason I put it where I did was there is another + config file function next to it). + 2003-03-04 Ken Raeburn <raeburn@mit.edu> * krb5.h (ENCTYPE_AES128_CTS_HMAC_SHA1_96, diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 82f25163a8..41c325da1e 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -174,6 +174,7 @@ typedef unsigned char u_char; */ #include <errno.h> #include "krb5.h" +#include "profile.h" #if 1 /* def NEED_SOCKETS */ #include "port-sockets.h" @@ -514,6 +515,11 @@ krb5_error_code krb5_os_init_context (krb5_context); void krb5_os_free_context (krb5_context); +/* This function is needed by KfM's KerberosPreferences API + * because it needs to be able to specify "secure" */ +krb5_error_code os_get_default_config_files + (profile_filespec_t **pfiles, krb5_boolean secure); + krb5_error_code krb5_find_config_files (void); krb5_error_code krb5_os_hostaddr @@ -969,12 +975,7 @@ void KRB5_CALLCONV krb5_free_pa_enc_ts (krb5_context, krb5_pa_enc_ts *); /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */ -#if TARGET_OS_MAC -#include <Kerberos/profile.h> -#include <Kerberos/com_err.h> /* Not included by Kerberos/profile.h */ -#else -#include "profile.h" -#endif +#include "com_err.h" struct _krb5_context { krb5_magic magic; diff --git a/src/include/krb5.hin b/src/include/krb5.hin index c6f7040a5a..eece828f1f 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -119,8 +119,7 @@ KRB5INT_BEGIN_DECLS #if TARGET_OS_MAC # if defined(__MWERKS__) -# pragma import on -# pragma enumsalwaysint on +# pragma import on # endif # pragma options align=mac68k #endif @@ -2555,10 +2554,9 @@ krb5_prompt_type* KRB5_CALLCONV krb5_get_prompt_types #if TARGET_OS_MAC # if defined(__MWERKS__) -# pragma enumsalwaysint reset -# pragma import reset +# pragma import reset # endif -# pragma options align=reset +# pragma options align=reset #endif KRB5INT_END_DECLS |