On a Macintosh, turn on kdc_timesync and use the v4 credentials cache

by default.

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 62c92296a129991aaaec2f8b00156625190e91dd..ea48f2c2a912beb8f4fa76bee395a1b7b277da2b 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,5 +1,8 @@
 Thu Apr 11 21:30:23 1996  Theodore Y. Ts'o  <tytso@dcl>
 
+       * init_ctx.c (krb5_init_context): On a Macintosh, turn on
+               kdc_timesync and use the v4 credentials cache by default.
+
        * get_in_tkt.c (stash_as_reply, verify_as_reply): Move time offset
                code from stash_as_reply to verify_as_reply, and fix it so
                that it actually works.

diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 96c406535725d246c350fab4ac1cfe4a0aa6b461..c64cb4c474174b53265e6bfeac36a6078d7a0b47 100644 (file)
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -64,8 +64,13 @@ krb5_init_context(context)
        ctx->kdc_req_sumtype = tmp;
 
        ctx->kdc_default_options = KDC_OPT_RENEWABLE_OK;
+#ifdef _MACINTOSH
+#define DEFAULT_KDC_TIMESYNC 1
+#else
+#define DEFAULT_KDC_TIMESYNC 0
+#endif
        profile_get_integer(ctx->profile, "libdefaults",
-                           "kdc_timesync", 0, 0,
+                           "kdc_timesync", 0, DEFAULT_KDC_TIMESYNC,
                            &tmp);
        ctx->library_options = tmp ? KRB5_LIBOPT_SYNC_KDCTIME : 0;
 
@@ -77,8 +82,13 @@ krb5_init_context(context)
         * Note: DCE 1.0.3a only supports a cache type of 1
         *      DCE 1.1 supports a cache type of 2.
         */
+#ifdef _MACINTOSH
+#define DEFAULT_CCACHE_TYPE 4
+#else
+#define DEFAULT_CCACHE_TYPE 3
+#endif
        profile_get_integer(ctx->profile, "libdefaults", "ccache_type",
-                           0, 3, &tmp);
+                           0, DEFAULT_CCACHE_TYPE, &tmp);
        ctx->fcc_default_format = tmp + 0x0500;
        ctx->scc_default_format = tmp + 0x0500;