src/usr.bin/ssh/channels.c - diff

Return to channels.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.146, 2001/12/06 18:20:32

version 1.147, 2001/12/08 17:49:28

Line 54

#include "canohost.h"

#include "key.h"

#include "authfd.h"

#include "pathnames.h"

/* -- channel core */

Line 2471

Line 2472

return display_number;

}

#ifndef X_UNIX_PATH

#define X_UNIX_PATH "/tmp/.X11-unix/X"

#endif

static int

connect_local_xsocket(u_int dnr)

{

static const char *const x_sockets[] = {

X_UNIX_PATH "%u",

"/var/X/.X11-unix/X" "%u",

"/usr/spool/sockets/X11/" "%u",

NULL

};

int sock;

struct sockaddr_un addr;

const char *const * path;

for (path = x_sockets; *path; ++path) {

sock = socket(AF_UNIX, SOCK_STREAM, 0);

if (sock < 0)

error("socket: %.100s", strerror(errno));

memset(&addr, 0, sizeof(addr));

addr.sun_family = AF_UNIX;

snprintf(addr.sun_path, sizeof addr.sun_path, _PATH_UNIX_X, dnr);

snprintf(addr.sun_path, sizeof addr.sun_path, *path, dnr);

if (connect(sock, (struct sockaddr *) & addr, sizeof(addr)) == 0)

return sock;

close(sock);

}

error("connect %.100s: %.100s", addr.sun_path, strerror(errno));

return -1;

}