From 2fcba2d23bb5ea957cadb4058eb25bff9dadaa63 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Wed, 18 Nov 1998 09:24:44 +0000
Subject: [PATCH] (doit_passive): parse $DISPLAY correctly

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5192 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/kx/kx.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/appl/kx/kx.c b/appl/kx/kx.c
index cc600148a..bcc0ca4af 100644
--- a/appl/kx/kx.c
+++ b/appl/kx/kx.c
@@ -329,14 +329,15 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
 	     if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
 		 err(1, "connect(%s)", host);
 	     {
-		 int d;
+		 int d = 0;
 		 char *s;
 
 		 s = getenv ("DISPLAY");
-		 if (s == NULL || (s = strchr(s, ':')) == NULL)
-		     d = 0;
-		 else
-		     d = atoi (s);
+		 if (s != NULL) {
+		     s = strchr (s, ':');
+		     if (s != NULL)
+			 d = atoi (s + 1);
+		 }
 
 		 xserver = connect_local_xsocket (d);
 		 if (xserver < 0)