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

Return to channels.c CVS log

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

Diff for /src/usr.bin/ssh/channels.c between version 1.5 and 1.6

-version 1.5, 1999/09/29 18:16:19
+version 1.6, 1999/09/29 21:14:16
 Line 18
 Line 18
 Line 18
  #include "includes.h"
  RCSID("$Id$");
- #ifndef HAVE_GETHOSTNAME
- #include <sys/utsname.h>
- #endif
  #include "ssh.h"
  #include "packet.h"
  #include "xmalloc.h"
-Line 1061
+Line 1058
 Line 1061
 Line 1058
    int display_number, port, sock;
    struct sockaddr_in sin;
    char buf[512];
- #ifdef HAVE_GETHOSTNAME
+   char hostname[MAXHOSTNAMELEN];
-   char hostname[257];
- #else
-   struct utsname uts;
- #endif
    for (display_number = options.x11_display_offset; display_number < MAX_DISPLAYS; display_number++)
      {
-Line 1107
+Line 1100
 Line 1107
 Line 1100
      }
    /* Set up a suitable value for the DISPLAY variable. */
- #ifdef HPSUX_NONSTANDARD_X11_KLUDGE
-   /* HPSUX has some special shared memory stuff in their X server, which
-      appears to be enable if the host name matches that of the local machine.
-      However, it can be circumvented by using the IP address of the local
-      machine instead.  */
    if (gethostname(hostname, sizeof(hostname)) < 0)
      fatal("gethostname: %.100s", strerror(errno));
-   {
+   snprintf(buf, sizeof buf, "%.400s:%d.%d", hostname,
-     struct hostent *hp;
+     display_number, screen_number);
-     struct in_addr addr;
-     hp = gethostbyname(hostname);
-     if (!hp->h_addr_list[0])
-       {
-         error("Could not server IP address for %.200d.", hostname);
-         packet_send_debug("Could not get server IP address for %.200d.",
-                           hostname);
-         shutdown(sock, 2);
-         close(sock);
-         return NULL;
-       }
-     memcpy(&addr, hp->h_addr_list[0], sizeof(addr));
-     sprintf(buf, "%.100s:%d.%d", inet_ntoa(addr), display_number,
-             screen_number);
-   }
- #else /* HPSUX_NONSTANDARD_X11_KLUDGE */
- #ifdef HAVE_GETHOSTNAME
-   if (gethostname(hostname, sizeof(hostname)) < 0)
-     fatal("gethostname: %.100s", strerror(errno));
-   sprintf(buf, "%.400s:%d.%d", hostname, display_number, screen_number);
- #else /* HAVE_GETHOSTNAME */
-   if (uname(&uts) < 0)
-     fatal("uname: %s", strerror(errno));
-   sprintf(buf, "%.400s:%d.%d", uts.nodename, display_number, screen_number);
- #endif /* HAVE_GETHOSTNAME */
- #endif /* HPSUX_NONSTANDARD_X11_KLUDGE */
    /* Allocate a channel for the socket. */
    (void)channel_allocate(SSH_CHANNEL_X11_LISTENER, sock,