diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2008-05-30 18:01:09 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2008-05-30 18:01:09 +0000 |
| commit | 94ae54563eeea9c657eb603651d0d32e535c7a23 (patch) | |
| tree | 4b905d7cd9b32a1b83d055031b3abd4a30de2856 | |
| parent | 4130bdde9450dd7b399aa3650ef7ae3ff7d738da (diff) | |
| download | krb5-94ae54563eeea9c657eb603651d0d32e535c7a23.zip krb5-94ae54563eeea9c657eb603651d0d32e535c7a23.tar.gz krb5-94ae54563eeea9c657eb603651d0d32e535c7a23.tar.bz2 | |
signed vs unsigned char * warnings in kdb_xdr.c
load and store functions in k5-platform.h take an unsigned char *, whereas
kdb_xdr.c was using a char * for decoding. This resulted in pages of warnings
in the parsing code. Switched to using an unsigned char * and cast in the
couple places where a char * is needed.
ticket: new
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20343 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/plugins/kdb/db2/kdb_xdr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/kdb/db2/kdb_xdr.c b/src/plugins/kdb/db2/kdb_xdr.c index 396350d..f00131a 100644 --- a/src/plugins/kdb/db2/kdb_xdr.c +++ b/src/plugins/kdb/db2/kdb_xdr.c @@ -65,7 +65,7 @@ krb5_encode_princ_contents(context, content, entry) int i, j; unsigned int unparse_princ_size; char * unparse_princ; - char * nextloc; + unsigned char * nextloc; krb5_tl_data * tl_data; krb5_error_code retval; krb5_int16 psize16; @@ -128,7 +128,7 @@ krb5_encode_princ_contents(context, content, entry) * Now we go through entry again, this time copying data * These first entries are always saved regardless of version */ - nextloc = content->data; + nextloc = (unsigned char *)content->data; /* Base Length */ krb5_kdb_encode_int16(entry->len, nextloc); @@ -250,7 +250,7 @@ krb5_decode_princ_contents(context, content, entry) krb5_db_entry * entry; { int sizeleft, i; - char * nextloc; + unsigned char * nextloc; krb5_tl_data ** tl_data; krb5_int16 i16; @@ -269,7 +269,7 @@ krb5_decode_princ_contents(context, content, entry) */ /* First do the easy stuff */ - nextloc = content->data; + nextloc = (unsigned char *)content->data; sizeleft = content->length; if ((sizeleft -= KRB5_KDB_V1_BASE_LENGTH) < 0) return KRB5_KDB_TRUNCATED_RECORD; @@ -349,9 +349,9 @@ krb5_decode_princ_contents(context, content, entry) i = (int) i16; nextloc += 2; - if ((retval = krb5_parse_name(context, nextloc, &(entry->princ)))) + if ((retval = krb5_parse_name(context, (char *)nextloc, &(entry->princ)))) goto error_out; - if (((size_t) i != (strlen(nextloc) + 1)) || (sizeleft < i)) { + if (((size_t) i != (strlen((char *)nextloc) + 1)) || (sizeleft < i)) { retval = KRB5_KDB_TRUNCATED_RECORD; goto error_out; } |