* in_tkt_sky.c (krb5_get_in_tkt_with_skey): Change cast from

        krb5_pointer to krb5_const_pointer to ensure const integrity of
        parameter.

        * in_tkt_ktb.c (keytab_keyproc): Add const argument to cast of
        keyseed to struct keytab_keyproc_arg to maintain const status.

        * conv_princ.c (krb5_524_conv_principal): Cast argument to
        memcpy to size_t.

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 17ad9ca04b9d8daba811126f089ca71b4863c5af..493e92c3ef179dbc2d25665a2692628cf9af0c47 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,15 @@
+2001-07-24  Ezra Peisach  <epeisach@mit.edu>
+
+       * in_tkt_sky.c (krb5_get_in_tkt_with_skey): Change cast from
+       krb5_pointer to krb5_const_pointer to ensure const integrity of
+       parameter.
+
+       * in_tkt_ktb.c (keytab_keyproc): Add const argument to cast of
+       keyseed to struct keytab_keyproc_arg to maintain const status.
+
+       * conv_princ.c (krb5_524_conv_principal): Cast argument to memcpy
+       to size_t.
+
 2001-07-06  Ezra Peisach  <epeisach@mit.edu>
 
        * conv_princ.c (krb5_425_conv_principal): Cast argument to tolower

diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c
index 71c5d27b0b2f79cd3c26d74d652897aae9c026ac..3897f562197ce8f5aca13a238dc04639b3126881 100644 (file)
--- a/src/lib/krb5/krb/conv_princ.c
+++ b/src/lib/krb5/krb/conv_princ.c
@@ -161,7 +161,7 @@ krb5_524_conv_principal(context, princ, name, inst, realm)
                       c = strnchr(compo->data, '.', compo->length);
                       if (!c || (c - compo->data) >= INST_SZ - 1)
                           return KRB5_INVALID_PRINCIPAL;
-                      memcpy(inst, compo->data, c - compo->data);
+                      memcpy(inst, compo->data, (size_t) (c - compo->data));
                       inst[c - compo->data] = '\0';
                   }
                   break;

diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c
index a0ced3372759576e4fa201554a229990fb07adbb..883587fb012b5b7f602da4fe01235dd9560f3612 100644 (file)
--- a/src/lib/krb5/krb/in_tkt_ktb.c
+++ b/src/lib/krb5/krb/in_tkt_ktb.c
@@ -55,7 +55,8 @@ keytab_keyproc(context, type, salt, keyseed, key)
     krb5_const_pointer keyseed;
     krb5_keyblock ** key;
 {
-    struct keytab_keyproc_arg * arg = (struct keytab_keyproc_arg *)keyseed;
+    const struct keytab_keyproc_arg * arg = 
+       (const struct keytab_keyproc_arg *)keyseed;
     krb5_keyblock *realkey;
     krb5_error_code retval = 0;
     krb5_keytab kt_id;

diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index 21386affc659d6e4f39debf4babd872ef16964b4..672f48598713e76d2658f5916aebaea2feb0db70 100644 (file)
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -113,7 +113,7 @@ krb5_get_in_tkt_with_skey(context, options, addrs, ktypes, pre_auth_types,
 {
     if (key) 
        return krb5_get_in_tkt(context, options, addrs, ktypes, pre_auth_types, 
-                              skey_keyproc, (krb5_pointer)key,
+                              skey_keyproc, (krb5_const_pointer)key,
                               krb5_kdc_rep_decrypt_proc, 0, creds,
                               ccache, ret_as_reply);
     else