(doit_active): check DISPLAY to figure out what local socket to
connect to. From Åke Sandgren <ake@cs.umu.se> git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5175 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
17
appl/kx/kx.c
17
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)
|
if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
|
||||||
err(1, "connect(%s)", host);
|
err(1, "connect(%s)", host);
|
||||||
xserver = connect_local_xsocket (0);
|
{
|
||||||
if (xserver < 0)
|
int d;
|
||||||
return 1;
|
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);
|
return passive_session (xserver, fd, &key, schedule);
|
||||||
} else {
|
} else {
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user