vishalmishra434 / rpms / openssh

Forked from rpms/openssh a month ago
Clone
Jan F. Chadima a3dee6
diff -up openssh-5.5p1/channels.c.x11 openssh-5.5p1/channels.c
Jan F. Chadima a3dee6
--- openssh-5.5p1/channels.c.x11	2010-06-25 13:35:44.000000000 +0200
Jan F. Chadima a3dee6
+++ openssh-5.5p1/channels.c	2010-06-25 13:40:40.000000000 +0200
Jan F. Chadima a3dee6
@@ -3354,7 +3354,17 @@ static int
Jan F. Chadima a3dee6
 connect_local_xsocket(u_int dnr)
Jan F. Chadima a3dee6
 {
Jan F. Chadima a3dee6
 	char buf[1024];
Jan F. Chadima a3dee6
+#ifdef linux
Jan F. Chadima a3dee6
+	int ret;
Jan F. Chadima a3dee6
+#endif
Jan F. Chadima a3dee6
 	snprintf(buf, sizeof buf, _PATH_UNIX_X, dnr);
Jan F. Chadima a3dee6
+#ifdef linux
Jan F. Chadima a3dee6
+	/* try abstract socket first */
Jan F. Chadima a3dee6
+	buf[0] = '\0';
Jan F. Chadima a3dee6
+	if ((ret = connect_local_xsocket_path(buf)) >= 0)
Jan F. Chadima a3dee6
+		return ret;
Jan F. Chadima a3dee6
+	buf[0] = '/';
Jan F. Chadima a3dee6
+#endif
Jan F. Chadima a3dee6
 	return connect_local_xsocket_path(buf);
Jan F. Chadima a3dee6
 }
Jan F. Chadima 41a56c