aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/krb5/krb/ChangeLog8
-rw-r--r--src/lib/krb5/krb/appdefault.c2
-rw-r--r--src/lib/krb5/krb/init_ctx.c2
-rw-r--r--src/lib/krb5/krb/preauth2.c2
4 files changed, 11 insertions, 3 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 436c566..c83f241 100644
--- 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 025a037..9478889 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 05762cd..59b6123 100644
--- 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 34cb40f..27eb00f 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);