From 3fea91fe5100a23bc3464332028ea7c7f193221f Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Fri, 2 Oct 1998 04:34:49 +0000 Subject: [PATCH] =?UTF-8?q?(doit=5Factive):=20check=20DISPLAY=20to=20figur?= =?UTF-8?q?e=20out=20what=20local=20socket=20to=20connect=20to.=20=20From?= =?UTF-8?q?=20=C3=85ke=20Sandgren=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5175 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/kx/kx.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/appl/kx/kx.c b/appl/kx/kx.c index 74d8db0a5..cc600148a 100644 --- a/appl/kx/kx.c +++ b/appl/kx/kx.c @@ -328,9 +328,20 @@ doit_passive (char *host, char *user, int debugp, int keepalivep, if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) err(1, "connect(%s)", host); - xserver = connect_local_xsocket (0); - if (xserver < 0) - return 1; + { + int d; + char *s; + + s = getenv ("DISPLAY"); + if (s == NULL || (s = strchr(s, ':')) == NULL) + d = 0; + else + d = atoi (s); + + xserver = connect_local_xsocket (d); + if (xserver < 0) + return 1; + } return passive_session (xserver, fd, &key, schedule); } else { }