From c03db05db0bd839913aab9f9cb998f4fc45261ed Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Thu, 6 Mar 2003 21:04:32 +0000 Subject: [PATCH] * appdefault.c: Fix constness to avoid warning. * init_ctx.c: Do the same stuff on the Mac as on Unix. * preauth2.c: Added cast to fix warning git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15258 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/ChangeLog | 8 ++++++++ src/lib/krb5/krb/appdefault.c | 2 +- src/lib/krb5/krb/init_ctx.c | 2 +- src/lib/krb5/krb/preauth2.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 436c56639..c83f241df 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,11 @@ +2003-03-06 Alexandra Ellwood + + * appdefault.c: Fix constness to avoid warning. + + * init_ctx.c: Do the same stuff on the Mac as on Unix. + + * preauth2.c: Added cast to fix warning. + 2003-03-04 Tom Yu * srv_rcache.c (krb5_get_server_rcache): Fix missed diff --git a/src/lib/krb5/krb/appdefault.c b/src/lib/krb5/krb/appdefault.c index 025a03785..94788899b 100644 --- a/src/lib/krb5/krb/appdefault.c +++ b/src/lib/krb5/krb/appdefault.c @@ -22,7 +22,7 @@ static const char *const conf_no[] = { static int conf_boolean(char *s) { - const char **p; + const char * const *p; for(p=conf_yes; *p; p++) { if (!strcasecmp(*p,s)) return 1; diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c index 05762cdb8..59b6123e6 100644 --- a/src/lib/krb5/krb/init_ctx.c +++ b/src/lib/krb5/krb/init_ctx.c @@ -56,7 +56,7 @@ #include #include "brand.c" /* There has to be a better way for windows... */ -#if defined(unix) +#if defined(unix) || TARGET_OS_MAC #include "../krb5_libinit.h" #endif diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c index 34cb40f22..27eb00f62 100644 --- a/src/lib/krb5/krb/preauth2.c +++ b/src/lib/krb5/krb/preauth2.c @@ -737,7 +737,7 @@ krb5_error_code pa_sam_2(krb5_context context, /* enc_sam_response_enc_2 from above */ retval = krb5_c_encrypt_length(context, as_key->enctype, scratch->length, - (unsigned int *) &sr2.sam_enc_nonce_or_sad.ciphertext.length); + (size_t *) &sr2.sam_enc_nonce_or_sad.ciphertext.length); if (retval) { krb5_free_sam_challenge_2(context, sc2); krb5_free_sam_challenge_2_body(context, sc2b); -- 2.26.2