From accc7d20c941731d4f11201f388802cbdc0d7c38 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 30 Mar 1997 18:57:54 +0000
Subject: [PATCH] fixes

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1531 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/kx/kx.c  | 14 ++++----------
 appl/kx/kx.h  |  3 +++
 appl/kx/kxd.c |  2 --
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/appl/kx/kx.c b/appl/kx/kx.c
index e7a816285..5bf36aadf 100644
--- a/appl/kx/kx.c
+++ b/appl/kx/kx.c
@@ -109,9 +109,7 @@ connect_host (char *host, char *user, des_cblock *key,
      int addrlen;
      struct hostent *hostent;
      int s;
-     u_char b;
      char **p;
-     char name[ANAME_SZ+1];
 
      hostent = gethostbyname (host);
      if (hostent == NULL) {
@@ -258,7 +256,7 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
      if (*p == ERROR) {
 	 p++;
 	 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) {
 	 errx (1, "%s: strange msg %d", host, *p);
      } else
@@ -276,7 +274,6 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
      status_output (debugp);
      for (;;) {
 	 pid_t child;
-	 int i;
 
 	 len = read_encrypted (otherside, msg, sizeof(msg), &ret,
 			       schedule, &key, &him, &me);
@@ -289,7 +286,7 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
 	 if (*p == ERROR) {
 	     p++;
 	     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) {
 	     errx (1, "%s: strange msg %d", host, *p);
 	 } else {
@@ -304,7 +301,6 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
 	     continue;
 	 } else if (child == 0) {
 	     struct sockaddr_in addr;
-	     int addrlen = sizeof(addr);
 	     int fd;
 	     int xserver;
 
@@ -410,7 +406,7 @@ doit_active (char *host, char *user,
     if (*p == ERROR) {
 	p++;
 	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) {
 	errx (1, "%s: strange msg %d", host, *p);
     } else
@@ -469,7 +465,7 @@ doit_active (char *host, char *user,
 	if (*p == ERROR) {
 	    p++;
 	    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) {
 	    errx (1, "%s: strange msg %d", host, *p);
 	} else {
@@ -484,9 +480,7 @@ doit_active (char *host, char *user,
 	    continue;
 	} else if (child == 0) {
 	    int s;
-	    u_char zero = 0;
 	    struct sockaddr_in addr;
-	    int addrlen = sizeof(addr);
 
 	    if (rendez_vous1)
 		close (rendez_vous1);
diff --git a/appl/kx/kx.h b/appl/kx/kx.h
index 1d129eea4..cbd788a1d 100644
--- a/appl/kx/kx.h
+++ b/appl/kx/kx.h
@@ -126,6 +126,9 @@ int connect_local_xsocket (unsigned dnr);
 int create_and_write_cookie (char *xauthfile,
 			     u_char *cookie,
 			     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
diff --git a/appl/kx/kxd.c b/appl/kx/kxd.c
index dc142a184..c7f8f0f89 100644
--- a/appl/kx/kxd.c
+++ b/appl/kx/kxd.c
@@ -231,7 +231,6 @@ doit_conn (int fd, int meta_sock, int flags,
 	   struct sockaddr_in *thataddr)
 {
     int sock, sock2;
-    int one = 1;
     struct sockaddr_in addr;
     int addrlen;
     u_char msg[1024], *p;
@@ -429,7 +428,6 @@ doit(int sock, int tcpp)
 	  }
 	  for (;;) {
 	      pid_t child;
-	      int fd;
 	      int len;
 	      void *ret;