oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

fix calls to krb5_net_{read,write}

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3910 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-11-11 01:37:57 +00:00
parent cdcd52185a
commit c264b952a5
12 changed files with 68 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/krb5/auth_context.c
View File

@@ -130,8 +130,9 @@ krb5_auth_con_setaddrs(krb5_context context,
krb5_error_code
krb5_auth_con_setaddrs_from_fd (krb5_context context,
krb5_auth_context auth_context,
int fd)
void *p_fd)
{
int fd = *((int *)p_fd);
krb5_error_code ret;
krb5_address local_k_address, remote_k_address;
krb5_address *lptr = NULL, *rptr = NULL;

5
lib/krb5/read_message.c
View File

@@ -48,15 +48,14 @@ krb5_read_message (krb5_context context,
krb5_error_code ret;
u_int32_t len;
u_int8_t buf[4];
int fd = *((int *)p_fd);
if (krb5_net_read (context, fd, buf, 4) != 4)
if (krb5_net_read (context, p_fd, buf, 4) != 4)
return errno;
len = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
ret = krb5_data_alloc (data, len);
if (ret)
return ret;
if (krb5_net_read (context, fd, data->data, len) != len) {
if (krb5_net_read (context, p_fd, data->data, len) != len) {
krb5_data_free (data);
return errno;
}

23
lib/krb5/recvauth.c
View File

@@ -58,7 +58,6 @@ krb5_recvauth(krb5_context context,
const char *version = KRB5_SENDAUTH_VERSION;
char her_version[sizeof(KRB5_SENDAUTH_VERSION)];
char *her_appl_version;
int fd = *((int *)p_fd);
u_int32_t len;
u_char repl;
krb5_data data;
@@ -76,48 +75,48 @@ krb5_recvauth(krb5_context context,
ret = krb5_auth_con_setaddrs_from_fd (context,
*auth_context,
fd);
p_fd);
if (ret)
return ret;
if(!(flags & KRB5_RECVAUTH_IGNORE_VERSION)) {
if (krb5_net_read (context, fd, &len, 4) != 4)
if (krb5_net_read (context, p_fd, &len, 4) != 4)
return errno;
len = ntohl(len);
if (len != sizeof(her_version)
|| krb5_net_read (context, fd, her_version, len) != len
|| krb5_net_read (context, p_fd, her_version, len) != len
|| strncmp (version, her_version, len)) {
repl = 1;
krb5_net_write (context, fd, &repl, 1);
krb5_net_write (context, p_fd, &repl, 1);
return KRB5_SENDAUTH_BADAUTHVERS;
}
}
if (krb5_net_read (context, fd, &len, 4) != 4)
if (krb5_net_read (context, p_fd, &len, 4) != 4)
return errno;
len = ntohl(len);
if (len != strlen(appl_version) + 1) {
repl = 2;
krb5_net_write (context, fd, &repl, 1);
krb5_net_write (context, p_fd, &repl, 1);
return KRB5_SENDAUTH_BADAPPLVERS;
}
her_appl_version = malloc (len);
if (her_appl_version == NULL) {
repl = 2;
krb5_net_write (context, fd, &repl, 1);
krb5_net_write (context, p_fd, &repl, 1);
return ENOMEM;
}
if (krb5_net_read (context, fd, her_appl_version, len) != len
if (krb5_net_read (context, p_fd, her_appl_version, len) != len
|| strcmp (appl_version, her_appl_version)) {
repl = 2;
krb5_net_write (context, fd, &repl, 1);
krb5_net_write (context, p_fd, &repl, 1);
free (her_appl_version);
return KRB5_SENDAUTH_BADAPPLVERS;
}
free (her_appl_version);
repl = 0;
if (krb5_net_write (context, fd, &repl, 1) != 1)
if (krb5_net_write (context, p_fd, &repl, 1) != 1)
return errno;
krb5_data_zero (&data);
@@ -153,7 +152,7 @@ krb5_recvauth(krb5_context context,
}
len = 0;
if (krb5_net_write (context, fd, &len, 4) != 4)
if (krb5_net_write (context, p_fd, &len, 4) != 4)
return errno;
if (ap_options & AP_OPTS_MUTUAL_REQUIRED) {

11
lib/krb5/sendauth.c
View File

@@ -83,7 +83,6 @@ krb5_sendauth(krb5_context context,
krb5_creds **out_creds)
{
krb5_error_code ret;
int fd = *((int *)p_fd);
u_int32_t len, net_len;
const char *version = KRB5_SENDAUTH_VERSION;
u_char repl;
@@ -94,17 +93,17 @@ krb5_sendauth(krb5_context context,
len = strlen(version) + 1;
net_len = htonl(len);
if (krb5_net_write (context, fd, &net_len, 4) != 4
|| krb5_net_write (context, fd, version, len) != len)
if (krb5_net_write (context, p_fd, &net_len, 4) != 4
|| krb5_net_write (context, p_fd, version, len) != len)
return errno;
len = strlen(appl_version) + 1;
net_len = htonl(len);
if (krb5_net_write (context, fd, &net_len, 4) != 4
|| krb5_net_write (context, fd, appl_version, len) != len)
if (krb5_net_write (context, p_fd, &net_len, 4) != 4
|| krb5_net_write (context, p_fd, appl_version, len) != len)
return errno;
if (krb5_net_read (context, fd, &repl, sizeof(repl)) != sizeof(repl))
if (krb5_net_read (context, p_fd, &repl, sizeof(repl)) != sizeof(repl))
return errno;
if (repl != 0)

5
lib/krb5/write_message.c
View File

@@ -47,15 +47,14 @@ krb5_write_message (krb5_context context,
{
u_int32_t len;
u_int8_t buf[4];
int fd = *((int *)p_fd);
len = data->length;
buf[0] = (len >> 24) & 0xFF;
buf[1] = (len >> 16) & 0xFF;
buf[2] = (len >> 8) & 0xFF;
buf[3] = (len >> 0) & 0xFF;
if (krb5_net_write (context, fd, buf, 4) != 4
|| krb5_net_write (context, fd, data->data, len) != len)
if (krb5_net_write (context, p_fd, buf, 4) != 4
|| krb5_net_write (context, p_fd, data->data, len) != len)
return errno;
return 0;
}