From cc80e0005fb455749a40affb911ff002c5be4efc Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 26 Jun 2002 00:12:13 +0000 Subject: [PATCH] * appdefault.c, get_in_tkt.c: made conf_yes and conf_no const to improve load time on Mach-O * init_ctx: fixed Mac OS macros [pullups from 1-2-2-branch] * rd_safe.c, rd_priv.c, rd_cred.c, preauth.c, mk_safe.c, mk_cred.c, appdefault.c: use "" includes for krb5.h, k5-int.h and syslog.h [pullup from 1-2-2-branch] git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14583 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/ChangeLog | 16 ++++++++++++++++ src/lib/krb5/krb/appdefault.c | 6 +++--- src/lib/krb5/krb/get_in_tkt.c | 4 ++-- src/lib/krb5/krb/init_ctx.c | 4 ++-- src/lib/krb5/krb/mk_cred.c | 2 +- src/lib/krb5/krb/mk_safe.c | 2 +- src/lib/krb5/krb/rd_cred.c | 2 +- src/lib/krb5/krb/rd_priv.c | 2 +- src/lib/krb5/krb/rd_safe.c | 2 +- 9 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 8a188d635..ba3eda690 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,19 @@ +2002-06-25 Alexandra Ellwood + + * appdefault.c, get_in_tkt.c: made conf_yes and conf_no const to + improve load time on Mach-O + + * init_ctx: fixed Mac OS macros + + [pullups from 1-2-2-branch] + +2001-06-25 Miro Jurisic + + * rd_safe.c, rd_priv.c, rd_cred.c, preauth.c, mk_safe.c, + mk_cred.c, appdefault.c: use "" includes for krb5.h, k5-int.h and + syslog.h + [pullup from 1-2-2-branch] + 2002-06-18 Ken Raeburn * sendauth.c (ECONNABORTED): Don't define here now that it's diff --git a/src/lib/krb5/krb/appdefault.c b/src/lib/krb5/krb/appdefault.c index e6b732d6f..5cc73cc91 100644 --- a/src/lib/krb5/krb/appdefault.c +++ b/src/lib/krb5/krb/appdefault.c @@ -5,17 +5,17 @@ #include #include -#include +#include "k5-int.h" /*xxx Duplicating this is annoying; try to work on a better way.*/ -static char *conf_yes[] = { +static const char *conf_yes[] = { "y", "yes", "true", "t", "1", "on", 0, }; -static char *conf_no[] = { +static const char *conf_no[] = { "n", "no", "false", "nil", "0", "off", 0, }; diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 7d8ff93cb..8a08ed72a 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -600,12 +600,12 @@ cleanup: is yet. */ /* XXX Duplicating this is annoying; try to work on a better way.*/ -static char *conf_yes[] = { +static const char *conf_yes[] = { "y", "yes", "true", "t", "1", "on", 0, }; -static char *conf_no[] = { +static const char *conf_no[] = { "n", "no", "false", "nil", "0", "off", 0, }; diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index c2477c5e2..c74fc9e01 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -193,7 +193,7 @@ init_common (context, secure) "kdc_default_options", 0, KDC_OPT_RENEWABLE_OK, &tmp); ctx->kdc_default_options = tmp; -#ifdef macintosh +#if TARGET_OS_MAC #define DEFAULT_KDC_TIMESYNC 1 #else #define DEFAULT_KDC_TIMESYNC 0 @@ -211,7 +211,7 @@ init_common (context, secure) * Note: DCE 1.0.3a only supports a cache type of 1 * DCE 1.1 supports a cache type of 2. */ -#ifdef macintosh +#if TARGET_OS_MAC #define DEFAULT_CCACHE_TYPE 4 #else #define DEFAULT_CCACHE_TYPE 3 diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c index 619881659..22713917a 100644 --- a/src/lib/krb5/krb/mk_cred.c +++ b/src/lib/krb5/krb/mk_cred.c @@ -7,7 +7,7 @@ * structures. * */ -#include +#include "k5-int.h" #include "cleanup.h" #include "auth_con.h" diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c index d34f88668..59fc388fb 100644 --- a/src/lib/krb5/krb/mk_safe.c +++ b/src/lib/krb5/krb/mk_safe.c @@ -27,7 +27,7 @@ * krb5_mk_safe() */ -#include +#include "k5-int.h" #include "cleanup.h" #include "auth_con.h" diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c index f8b92a9f6..d6fc23742 100644 --- a/src/lib/krb5/krb/rd_cred.c +++ b/src/lib/krb5/krb/rd_cred.c @@ -1,4 +1,4 @@ -#include +#include "k5-int.h" #include "cleanup.h" #include "auth_con.h" diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c index f4adea75f..d223782cc 100644 --- a/src/lib/krb5/krb/rd_priv.c +++ b/src/lib/krb5/krb/rd_priv.c @@ -27,7 +27,7 @@ * krb5_rd_priv() */ -#include +#include "k5-int.h" #include "cleanup.h" #include "auth_con.h" diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c index 200a338cb..61488ea82 100644 --- a/src/lib/krb5/krb/rd_safe.c +++ b/src/lib/krb5/krb/rd_safe.c @@ -27,7 +27,7 @@ * krb5_rd_safe() */ -#include +#include "k5-int.h" #include "cleanup.h" #include "auth_con.h" -- 2.26.2