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

(replace_cookie): try to handle the case of not finding any cookies

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5266 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1998-12-18 16:42:00 +00:00
parent 5e87369170
commit 4d816f025a
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
appl/kx/common.c
View File

@@ -590,8 +590,13 @@ replace_cookie(int xserver, int fd, char *filename, int cookiesp) /* XXX */
auth = XauReadAuth(f); auth = XauReadAuth(f);
fclose(f); fclose(f);
if (auth != NULL) {
n = auth->name_length; n = auth->name_length;
d = auth->data_length; d = auth->data_length;
} else {
n = 0;
d = 0;
}
if (bigendianp) { if (bigendianp) {
len[0] = n >> 8; len[0] = n >> 8;
len[1] = n & 0xFF; len[1] = n & 0xFF;
@@ -605,20 +610,16 @@ replace_cookie(int xserver, int fd, char *filename, int cookiesp) /* XXX */
} }
if (krb_net_write (xserver, len, 6) != 6) if (krb_net_write (xserver, len, 6) != 6)
return 1; return 1;
if(krb_net_write (xserver, auth->name, n) != n) if(n != 0 && krb_net_write (xserver, auth->name, n) != n)
return 1; return 1;
npad = (4 - (n % 4)) % 4; npad = (4 - (n % 4)) % 4;
if (npad) { if (npad && krb_net_write (xserver, zeros, npad) != npad)
if (krb_net_write (xserver, zeros, npad) != npad)
return 1; return 1;
} if (d != 0 && krb_net_write (xserver, auth->data, d) != d)
if (krb_net_write (xserver, auth->data, d) != d)
return 1; return 1;
dpad = (4 - (d % 4)) % 4; dpad = (4 - (d % 4)) % 4;
if (dpad) { if (dpad && krb_net_write (xserver, zeros, dpad) != dpad)
if (krb_net_write (xserver, zeros, dpad) != dpad)
return 1; return 1;
}
XauDisposeAuth(auth); XauDisposeAuth(auth);
} else { } else {
if(krb_net_write(xserver, zeros, 6) != 6) if(krb_net_write(xserver, zeros, 6) != 6)