(connect_local_xsocket): update to try the list of potential socket
pathnames git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4781 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -277,17 +277,20 @@ connect_local_xsocket (unsigned dnr)
|
|||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
struct sockaddr_un addr;
|
struct sockaddr_un addr;
|
||||||
|
char **path;
|
||||||
|
|
||||||
|
for (path = x_paths; *path; ++path) {
|
||||||
fd = socket (AF_UNIX, SOCK_STREAM, 0);
|
fd = socket (AF_UNIX, SOCK_STREAM, 0);
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
err (1, "socket AF_UNIX");
|
err (1, "socket AF_UNIX");
|
||||||
|
memset (&addr, 0, sizeof(addr));
|
||||||
addr.sun_family = AF_UNIX;
|
addr.sun_family = AF_UNIX;
|
||||||
snprintf (addr.sun_path, sizeof(addr.sun_path),
|
snprintf (addr.sun_path, sizeof(addr.sun_path), *path, dnr);
|
||||||
X_UNIX_PATH "%u", dnr);
|
if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) == 0)
|
||||||
if (connect (fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
|
|
||||||
err (1, "connect");
|
|
||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
err (1, "connecting to local display %u", dnr);
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
create_and_write_cookie (char *xauthfile,
|
create_and_write_cookie (char *xauthfile,
|
||||||
|
Reference in New Issue
Block a user