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

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) {