pkgs/openssh/patches/openssh-5.5p1-x11.patch

   1 diff -up openssh-5.3p1/channels.c.bz595935 openssh-5.3p1/channels.c
   2 --- openssh-5.3p1/channels.c.bz595935   2010-08-12 14:19:28.000000000 +0200
   3 +++ openssh-5.3p1/channels.c    2010-08-12 14:33:51.000000000 +0200
   4 @@ -3185,7 +3185,7 @@ x11_create_display_inet(int x11_display_
   5  }
   6
   7  static int
   8 -connect_local_xsocket_path(const char *pathname)
   9 +connect_local_xsocket_path(const char *pathname, int len)
  10  {
  11         int sock;
  12         struct sockaddr_un addr;
  13 @@ -3195,11 +3195,14 @@ connect_local_xsocket_path(const char *p
  14                 error("socket: %.100s", strerror(errno));
  15         memset(&addr, 0, sizeof(addr));
  16         addr.sun_family = AF_UNIX;
  17 -       strlcpy(addr.sun_path, pathname, sizeof addr.sun_path);
  18 -       if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0)
  19 +       if (len <= 0)
  20 +               return -1;
  21 +       if (len > sizeof addr.sun_path)
  22 +               len = sizeof addr.sun_path;
  23 +       memcpy(addr.sun_path, pathname, len);
  24 +       if (connect(sock, (struct sockaddr *)&addr, sizeof addr - (sizeof addr.sun_path - len) ) == 0)
  25                 return sock;
  26         close(sock);
  27 -       error("connect %.100s: %.100s", addr.sun_path, strerror(errno));
  28         return -1;
  29  }
  30
  31 @@ -3207,8 +3210,21 @@ static int
  32  connect_local_xsocket(u_int dnr)
  33  {
  34         char buf[1024];
  35 -       snprintf(buf, sizeof buf, _PATH_UNIX_X, dnr);
  36 -       return connect_local_xsocket_path(buf);
  37 +       int len;
  38 +#ifdef linux
  39 +       int ret;
  40 +#endif
  41 +       len = snprintf(buf + 1, sizeof (buf) - 1, _PATH_UNIX_X, dnr);
  42 +#ifdef linux
  43 +       /* try abstract socket first */
  44 +       buf[0] = '\0';
  45 +       if ((ret = connect_local_xsocket_path(buf, len + 1)) >= 0)
  46 +               return ret;
  47 +#endif
  48 +       if ((ret = connect_local_xsocket_path(buf + 1, len)) >= 0)
  49 +               return ret;
  50 +       error("connect %.100s: %.100s", buf + 1, strerror(errno));
  51 +       return -1;
  52  }
  53
  54  int