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

fixes

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1531 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-03-30 18:57:54 +00:00
parent 67096ebcd1
commit accc7d20c9
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
appl/kx/kx.c
View File

@@ -109,9 +109,7 @@ connect_host (char *host, char *user, des_cblock *key,
int addrlen; int addrlen;
struct hostent *hostent; struct hostent *hostent;
int s; int s;
u_char b;
char **p; char **p;
char name[ANAME_SZ+1];
hostent = gethostbyname (host); hostent = gethostbyname (host);
if (hostent == NULL) { if (hostent == NULL) {
@@ -258,7 +256,7 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
if (*p == ERROR) { if (*p == ERROR) {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %.*s", host, tmp, p); errx (1, "%s: %.*s", host, (int)tmp, p);
} else if (*p != ACK) { } else if (*p != ACK) {
errx (1, "%s: strange msg %d", host, *p); errx (1, "%s: strange msg %d", host, *p);
} else } else
@@ -276,7 +274,6 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
status_output (debugp); status_output (debugp);
for (;;) { for (;;) {
pid_t child; pid_t child;
int i;
len = read_encrypted (otherside, msg, sizeof(msg), &ret, len = read_encrypted (otherside, msg, sizeof(msg), &ret,
schedule, &key, &him, &me); schedule, &key, &him, &me);
@@ -289,7 +286,7 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
if (*p == ERROR) { if (*p == ERROR) {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %.*s", host, tmp, p); errx (1, "%s: %.*s", host, (int)tmp, p);
} else if(*p != NEW_CONN) { } else if(*p != NEW_CONN) {
errx (1, "%s: strange msg %d", host, *p); errx (1, "%s: strange msg %d", host, *p);
} else { } else {
@@ -304,7 +301,6 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
continue; continue;
} else if (child == 0) { } else if (child == 0) {
struct sockaddr_in addr; struct sockaddr_in addr;
int addrlen = sizeof(addr);
int fd; int fd;
int xserver; int xserver;
@@ -410,7 +406,7 @@ doit_active (char *host, char *user,
if (*p == ERROR) { if (*p == ERROR) {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %.*s", host, tmp, p); errx (1, "%s: %.*s", host, (int)tmp, p);
} else if (*p != ACK) { } else if (*p != ACK) {
errx (1, "%s: strange msg %d", host, *p); errx (1, "%s: strange msg %d", host, *p);
} else } else
@@ -469,7 +465,7 @@ doit_active (char *host, char *user,
if (*p == ERROR) { if (*p == ERROR) {
p++; p++;
p += krb_get_int (p, &tmp, 4, 0); p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %.*s", host, tmp, p); errx (1, "%s: %.*s", host, (int)tmp, p);
} else if (*p != NEW_CONN) { } else if (*p != NEW_CONN) {
errx (1, "%s: strange msg %d", host, *p); errx (1, "%s: strange msg %d", host, *p);
} else { } else {
@@ -484,9 +480,7 @@ doit_active (char *host, char *user,
continue; continue;
} else if (child == 0) { } else if (child == 0) {
int s; int s;
u_char zero = 0;
struct sockaddr_in addr; struct sockaddr_in addr;
int addrlen = sizeof(addr);
if (rendez_vous1) if (rendez_vous1)
close (rendez_vous1); close (rendez_vous1);

3
appl/kx/kx.h
View File

@@ -126,6 +126,9 @@ int connect_local_xsocket (unsigned dnr);
int create_and_write_cookie (char *xauthfile, int create_and_write_cookie (char *xauthfile,
u_char *cookie, u_char *cookie,
size_t sz); size_t sz);
int verify_and_remove_cookies (int fd, int sock);
int replace_cookie(int xserver, int fd, char *filename);
int suspicious_address (int sock, struct sockaddr_in addr); int suspicious_address (int sock, struct sockaddr_in addr);
int int

2
appl/kx/kxd.c
View File

@@ -231,7 +231,6 @@ doit_conn (int fd, int meta_sock, int flags,
struct sockaddr_in *thataddr) struct sockaddr_in *thataddr)
{ {
int sock, sock2; int sock, sock2;
int one = 1;
struct sockaddr_in addr; struct sockaddr_in addr;
int addrlen; int addrlen;
u_char msg[1024], *p; u_char msg[1024], *p;
@@ -429,7 +428,6 @@ doit(int sock, int tcpp)
} }
for (;;) { for (;;) {
pid_t child; pid_t child;
int fd;
int len; int len;
void *ret; void *ret;