#ifdefed out krb5_*config_file on MacOS

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11570 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index aca43d257f54d4bf3450840b1a3e7f1534ee684c..8adfca8138afba890b3f7904675138c4855da168 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+1999-07-21  Miro Jurisic  <meeroh@.mit.edu>
+
+       * krb5.hin: #ifdefed out krb5_set_config_files, 
+               krb5_get_default_config_files, and krb5_free_confilg_files
+               on the Mac
+
 1999-06-16  Danilo Almeida  <dalmeida@mit.edu>
 
        * krb5.hin (krb5_get_default_config_files, krb5_free_config_files): 

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 91091a8b14c267ccc3a925c256509b9d90030085..e11257b1df55ad796d93d0de53e1b4063f908c97 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -1820,6 +1820,7 @@ krb5_change_password
                        int *result_code, krb5_data *result_code_string,
                        krb5_data *result_string));
 
+#ifndef macintosh
 krb5_error_code krb5_set_config_files
        KRB5_PROTOTYPE ((krb5_context, krb5_const char FAR * FAR *));
 
@@ -1829,6 +1830,8 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_get_default_config_files
 KRB5_DLLIMP void KRB5_CALLCONV krb5_free_config_files
        KRB5_PROTOTYPE((char **filenames));
 
+#endif
+
 krb5_error_code krb5_secure_config_files
        KRB5_PROTOTYPE ((krb5_context));
 
@@ -2387,11 +2390,6 @@ KRB5_PROTOTYPE((krb5_context context,
                krb5_ccache ccache,
                char *in_tkt_service));
 
-/* Macintoh CFM-68K magic incantation */
-#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
-#pragma import reset
-#endif
-
 /*
  * The realm iterator functions
  */
@@ -2415,5 +2413,10 @@ KRB5_DLLIMP void KRB5_CALLCONV krb5_free_realm_string
 }
 #endif
 
+/* Macintoh CFM-68K magic incantation */
+#if defined(macintosh) && defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
+#pragma import reset
+#endif
+
 #endif /* KRB5_GENERAL__ */
 

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index c46b13b5dbf93c112510e2f1d6d60ae8038b9e63..08bd3ed21429c6e934e39de8da7212b39aa66da0 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-21 Miro Jurisic   <meeroh@mit.edu>
+
+       * profile.hin, prof_file.c, prof_init.c, prof_int.h:
+               MacOS now uses file specifiers rather than file paths
+
 1999-07-14 Miro Jurisic   <meeroh@mit.edu>
 
        * profile.hin: added #ifdef __cplusplus extern "C"