summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-05-30 23:36:00 +0000
committerKen Raeburn <raeburn@mit.edu>2003-05-30 23:36:00 +0000
commitd20a0c8ee73c2511efb14259a97705a4235ca6ba (patch)
treefa0ab7c633b1287b0aee34c64e80d0d04fd7b5f9
parent96b2f1b517037b159bc1d0fe9f5c22054ec285c0 (diff)
downloadkrb5-d20a0c8ee73c2511efb14259a97705a4235ca6ba.tar.gz
krb5-d20a0c8ee73c2511efb14259a97705a4235ca6ba.tar.xz
krb5-d20a0c8ee73c2511efb14259a97705a4235ca6ba.zip
* 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
-rw-r--r--src/lib/krb5/krb/ChangeLog5
-rw-r--r--src/lib/krb5/krb/init_ctx.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 23ea95209..b5a74035b 100644
--- 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 a37d8e0a7..2b9bcb84f 100644
--- 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;