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

(v5_loop, kadmind_loop): more error checking and more correct error

Browse Source 
messages


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6826 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-08-16 12:45:03 +00:00
parent c139c81e0d
commit 07da4391d7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kadmin/server.c
View File

@@ -343,7 +343,11 @@ v5_loop (krb5_context context,
krb5_data in, out, msg, reply;
for (;;) {
krb5_net_read(context, &fd, tmp, 4);
n = krb5_net_read(context, &fd, tmp, 4);
if (n < 0)
krb5_err (context, 1, ret, "krb5_net_read");
if (n == 0)
exit (0);
_krb5_get_int (tmp, &len, 4);
ret = krb5_data_alloc(&in, len);
@@ -355,9 +359,9 @@ v5_loop (krb5_context context,
exit (0);
if(n < 0)
krb5_errx(context, 1, "read error: %d", errno);
if(n < in.length)
krb5_errx(context, 1, "short read (%ld)", (long int)n);
ret = krb5_rd_priv(context, ac, &in, &out, NULL);
if (ret)
krb5_err(context, 1, ret, "krb5_rd_priv");
krb5_data_free(&in);
kadmind_dispatch(kadm_handle, &out, &msg);
krb5_data_free(&out);
@@ -394,11 +398,15 @@ handle_v5(krb5_context context,
krb5_principal server;
char *client;
void *kadm_handle;
ssize_t n;
if (len != sizeof(KRB5_SENDAUTH_VERSION))
krb5_errx(context, 1, "bad sendauth len %d", len);
if(krb5_net_read(context, &fd, version, len) != len)
n = krb5_net_read(context, &fd, version, len);
if (n < 0)
krb5_err (context, 1, errno, "reading sendauth version");
if (n == 0)
krb5_errx (context, 1, "EOF reading sendauth version");
if(memcmp(version, KRB5_SENDAUTH_VERSION, len) != 0)
krb5_errx(context, 1, "bad sendauth version %.8s", version);
@@ -441,8 +449,6 @@ kadmind_loop(krb5_context context,
exit(0);
if(n < 0)
krb5_errx(context, 1, "read error: %d", errno);
if(n < 4)
krb5_errx(context, 1, "short read (%ld)", (long int)n);
_krb5_get_int(tmp, &len, 4);
if(len > 0xffff && (len & 0xffff) == ('K' << 8) + 'A') {
len >>= 16;