* init_ctx.c (DEFAULT_KDC_TIMESYNC): Define as 1 always.

(DEFAULT_CCACHE_TYPE): Define as 4 always.

ticket: 1190
status: open

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 23ea952092fe57ba48ffdbf10c58c0d72a5b7bef..b5a74035b79ddc8cb7dc986d247d5b668c22cc3f 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-30  Ken Raeburn  <raeburn@mit.edu>
+
+       * init_ctx.c (DEFAULT_KDC_TIMESYNC): Define as 1 always.
+       (DEFAULT_CCACHE_TYPE): Define as 4 always.
+
 2003-05-30  Alexandra Ellwood <lxs@mit.edu>
 
        * get_in_tkt.c: (verify_as_reply) Only check the renewable lifetime

diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index a37d8e0a75eff49070da0d21d0aa9cc656fa8ac5..2b9bcb84fcf77180b5ef7fcc31b506a24a651e10 100644 (file)
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -201,11 +201,7 @@ init_common (krb5_context *context, krb5_boolean secure)
                            "kdc_default_options", 0,
                            KDC_OPT_RENEWABLE_OK, &tmp);
        ctx->kdc_default_options = tmp;
-#if TARGET_OS_MAC
 #define DEFAULT_KDC_TIMESYNC 1
-#else
-#define DEFAULT_KDC_TIMESYNC 0
-#endif
        profile_get_integer(ctx->profile, "libdefaults",
                            "kdc_timesync", 0, DEFAULT_KDC_TIMESYNC,
                            &tmp);
@@ -219,11 +215,7 @@ init_common (krb5_context *context, krb5_boolean secure)
         * Note: DCE 1.0.3a only supports a cache type of 1
         *      DCE 1.1 supports a cache type of 2.
         */
-#if TARGET_OS_MAC
 #define DEFAULT_CCACHE_TYPE 4
-#else
-#define DEFAULT_CCACHE_TYPE 3
-#endif
        profile_get_integer(ctx->profile, "libdefaults", "ccache_type",
                            0, DEFAULT_CCACHE_TYPE, &tmp);
        ctx->fcc_default_format = tmp + 0x0500;