From b68256b05af032ddcc8acda0b46c281b60d2d972 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Tue, 17 Oct 2000 23:04:32 +0000 Subject: * encode.c, krb524.h: encode_v4tkt() and decode_v4tkt() now take unsigned int * lengths. * krb524d.c (do_connection): Cast length fields in recvfrom() and sendto() calls to int. * sendmsg.c (krb524_sendto_kdc): Cast length fields in recv() and send() calls to int. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12788 dc483132-0cff-0310-8789-dd5450dbe970 --- src/krb524/ChangeLog | 11 +++++++++++ src/krb524/encode.c | 8 ++++---- src/krb524/krb524.h | 4 ++-- src/krb524/krb524d.c | 4 ++-- src/krb524/sendmsg.c | 4 ++-- 5 files changed, 21 insertions(+), 10 deletions(-) (limited to 'src/krb524') diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 9ef4dbd1a..27718a831 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,14 @@ +2000-10-17 Ezra Peisach + + * encode.c, krb524.h: encode_v4tkt() and decode_v4tkt() now take + unsigned int * lengths. + + * krb524d.c (do_connection): Cast length fields in recvfrom() and + sendto() calls to int. + + * sendmsg.c (krb524_sendto_kdc): Cast length fields in recv() and + send() calls to int. + 2000-10-06 Tom Yu * conv_creds.c (krb524_convert_creds_plain): Use time_to_life() diff --git a/src/krb524/encode.c b/src/krb524/encode.c index 6c480d404..60a821410 100644 --- a/src/krb524/encode.c +++ b/src/krb524/encode.c @@ -41,12 +41,12 @@ * the wheel is hidden. */ -int encode_v4tkt KRB5_PROTOTYPE((KTEXT_ST *, char *, int *)), +int encode_v4tkt KRB5_PROTOTYPE((KTEXT_ST *, char *, unsigned int *)), encode_ktext KRB5_PROTOTYPE((char **, int *, KTEXT_ST *)), encode_bytes KRB5_PROTOTYPE((char **, int *, char *, int)), encode_int32 KRB5_PROTOTYPE((char **, int *, krb5_int32 *)); -int decode_v4tkt KRB5_PROTOTYPE((KTEXT_ST *, char *, int *)), +int decode_v4tkt KRB5_PROTOTYPE((KTEXT_ST *, char *, unsigned int *)), decode_ktext KRB5_PROTOTYPE((char **, int *, KTEXT_ST *)), decode_bytes KRB5_PROTOTYPE((char **, int *, char *, int)), decode_int32 KRB5_PROTOTYPE((char **, int *, krb5_int32 *)); @@ -79,7 +79,7 @@ int encode_int32(out, outlen, v) int encode_v4tkt(v4tkt, buf, encoded_len) KTEXT_ST *v4tkt; char *buf; - int *encoded_len; + unsigned int *encoded_len; { int buflen, ret; @@ -129,7 +129,7 @@ int decode_int32(out, outlen, v) int decode_v4tkt(v4tkt, buf, encoded_len) KTEXT_ST *v4tkt; char *buf; - int *encoded_len; + unsigned int *encoded_len; { int buflen, ret; diff --git a/src/krb524/krb524.h b/src/krb524/krb524.h index da9c008e7..f5f3d528c 100644 --- a/src/krb524/krb524.h +++ b/src/krb524/krb524.h @@ -61,10 +61,10 @@ int krb524_convert_tkt /* encode.c */ int encode_v4tkt - KRB5_PROTOTYPE((KTEXT_ST *v4tkt, char *buf, int *encoded_len)); + KRB5_PROTOTYPE((KTEXT_ST *v4tkt, char *buf, unsigned int *encoded_len)); int decode_v4tkt - KRB5_PROTOTYPE((KTEXT_ST *v4tkt, char *buf, int *encoded_len)); + KRB5_PROTOTYPE((KTEXT_ST *v4tkt, char *buf, unsigned int *encoded_len)); /* misc.c */ diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index 1561a9561..737818e3c 100644 --- a/src/krb524/krb524d.c +++ b/src/krb524/krb524d.c @@ -263,7 +263,7 @@ krb5_error_code do_connection(s, context) msgdata.length = MSGSIZE; saddrlen = sizeof(struct sockaddr); - ret = recvfrom(s, msgdata.data, msgdata.length, 0, &saddr, &saddrlen); + ret = recvfrom(s, msgdata.data, (int) msgdata.length, 0, &saddr, &saddrlen); if (ret < 0) { /* if recvfrom fails, we probably don't have a valid saddr to use for the reply, so don't even try to respond. */ @@ -361,7 +361,7 @@ error: write_msg: if (ret) - (void) sendto(s, msgdata.data, msgdata.length, 0, &saddr, saddrlen); + (void) sendto(s, msgdata.data, (int) msgdata.length, 0, &saddr, saddrlen); else if (sendto(s, msgdata.data, msgdata.length, 0, &saddr, saddrlen)<0) ret = errno; diff --git a/src/krb524/sendmsg.c b/src/krb524/sendmsg.c index 8170891b4..a6ce10db7 100644 --- a/src/krb524/sendmsg.c +++ b/src/krb524/sendmsg.c @@ -166,7 +166,7 @@ krb524_sendto_kdc (context, message, realm, reply) continue; } if (send(socklist[host], - message->data, message->length, 0) != message->length) + message->data, (int) message->length, 0) != message->length) continue; retry: waitlen.tv_usec = 0; @@ -185,7 +185,7 @@ krb524_sendto_kdc (context, message, realm, reply) goto out; } if ((cc = recv(socklist[host], - reply->data, reply->length, 0)) == SOCKET_ERROR) + reply->data, (int) reply->length, 0)) == SOCKET_ERROR) { /* man page says error could be: EBADF: won't happen -- cgit