diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2000-10-06 16:24:32 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2000-10-06 16:24:32 +0000 |
| commit | d80f58f8c649edbdc4f67fe9eece8388567c7552 (patch) | |
| tree | 9f6020578e1c9ace1688064579a0553b702b2073 /src/krb524/krb524d.c | |
| parent | 60fe6cff157258de0ac2ff10017e28edefa46d6a (diff) | |
| download | krb5-d80f58f8c649edbdc4f67fe9eece8388567c7552.zip krb5-d80f58f8c649edbdc4f67fe9eece8388567c7552.tar.gz krb5-d80f58f8c649edbdc4f67fe9eece8388567c7552.tar.bz2 | |
* krb524d.c (do_connection): Do not assume that sizeof(int) == 4
* encode.c (encode_int32, decode_int32): Do not assume
sizeof(int) == 4.
* conv_creds.c (krb524_convert_creds_kdc): Do not assume
sizeof(int) == 4 in network packet.
* cnv_tkt_skey.c (krb524int_krb_cr_tkt_int): Ensure that OTW flags
is one byte long. An error was introduced when prototypes were
widened.
* Makefile.in (includes): When testing to see if krb524_err.h
exists in the include directory, compare against the build trees
version.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12725 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/krb524/krb524d.c')
| -rw-r--r-- | src/krb524/krb524d.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index cad0e31..1561a95 100644 --- a/src/krb524/krb524d.c +++ b/src/krb524/krb524d.c @@ -252,7 +252,8 @@ krb5_error_code do_connection(s, context) krb5_keyblock v5_service_key, v4_service_key; krb5_data msgdata, tktdata; char msgbuf[MSGSIZE], tktbuf[TKT_BUFSIZ], *p; - int n, ret, saddrlen; + int ret, saddrlen; + krb5_int32 n; /* Must be 4 bytes */ krb5_kvno v4kvno; /* Clear out keyblock contents so we don't accidentally free the stack.*/ @@ -283,7 +284,7 @@ krb5_error_code do_connection(s, context) break; default: /* try and recognize our own error packet */ - if (msgdata.length == sizeof(int)) + if (msgdata.length == sizeof(krb5_int32)) return KRB5_BADMSGTYPE; else goto error; @@ -342,17 +343,17 @@ error: msgdata.length = 0; n = htonl(ret); - memcpy(p, (char *) &n, sizeof(int)); - p += sizeof(int); - msgdata.length += sizeof(int); + memcpy(p, (char *) &n, sizeof(krb5_int32)); + p += sizeof(krb5_int32); + msgdata.length += sizeof(krb5_int32); if (ret) goto write_msg; n = htonl(v4kvno); - memcpy(p, (char *) &n, sizeof(int)); - p += sizeof(int); - msgdata.length += sizeof(int); + memcpy(p, (char *) &n, sizeof(krb5_int32)); + p += sizeof(krb5_int32); + msgdata.length += sizeof(krb5_int32); memcpy(p, tktdata.data, tktdata.length); p += tktdata.length; |