* appdefault.c: Fix constness to avoid warning. * init_ctx.c: Do the same stuff on...

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 436c56639b4fb36d07d0bf2edd08df12b20f65e8..c83f241dfcfadac3e2e0a670984441fa922dc614 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-06  Alexandra Ellwood <lxs@mit.edu>
+
+    * 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  <tlyu@mit.edu>
 
        * 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 025a037857a2ccdd965ef5f4026553b15078d709..94788899b62d576d73c5edd8c40ce7df06ed1a07 100644 (file)
--- 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 05762cdb8bfffb1eb9e6eee464cb7dc015b94fb1..59b6123e677ffc371fe40981ff977257dfac43ee 100644 (file)
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -56,7 +56,7 @@
 #include <ctype.h>
 #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 34cb40f22ccad737bc20753c5b49691fb9c0ff99..27eb00f622a700aa36a9e6ec5b67151b4c5a61d4 100644 (file)
--- 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);