- (bal) Generalize lack of UNIX sockets since this also effects Cray

   not just Cygwin.  Based on patch by Wendy Palm <wendyp@cray.com>

diff --git a/ChangeLog b/ChangeLog
index 38c48e2a542f46afd0091c71d2c454afd7a7fa47..71ccff2bc64669b346b2205573f66ae2851e4d6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    Patch by Pekka Savola <pekkas@netcore.fi>
  - (bal) Renamed sigaction.[ch] to sigact.[ch].  Causes problems with
    some platforms.
+ - (bal) Generalize lack of UNIX sockets since this also effects Cray
+   not just Cygwin.  Based on patch by Wendy Palm <wendyp@cray.com>
 
 20010223
  - (bal) Fix --define rh7 in openssh.spec file.  Patch by Steve Tell

diff --git a/configure.in b/configure.in
index 677140bd0ee7ffde0b13ef62bd4fbc6e865557a8..b1f859ae5e0cea892bcb23475e1e73fbbee2c132 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -71,6 +71,7 @@ case "$host" in
        AC_DEFINE(IPV4_DEFAULT)
        AC_DEFINE(IP_TOS_IS_BROKEN)
        AC_DEFINE(BROKEN_VHANGUP)
+       AC_DEFINE(NO_X11_UNIX_SOCKETS)
        no_libsocket=1
        no_libnsl=1
        ;;

diff --git a/defines.h b/defines.h
index 4e3682838ec97903d2babd181068e7b4ec69315f..4879f2a3a11df5046ff95ab48ba7a650ad25023f 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -138,12 +138,20 @@ typedef char int8_t;
 # if (SIZEOF_SHORT_INT == 2)
 typedef short int int16_t;
 # else
-#  error "16 bit int type not found."
+#  ifdef _CRAY
+typedef long  int16_t;
+#  else
+#   error "16 bit int type not found."
+#  endif /* _CRAY */
 # endif
 # if (SIZEOF_INT == 4)
 typedef int int32_t;
 # else
-#  error "32 bit int type not found."
+#  ifdef _CRAY
+typedef long  int32_t;
+#  else
+#   error "32 bit int type not found."
+#  endif /* _CRAY */
 # endif
 #endif
 
@@ -163,12 +171,20 @@ typedef unsigned char u_int8_t;
 #  if (SIZEOF_SHORT_INT == 2)
 typedef unsigned short int u_int16_t;
 #  else
-#   error "16 bit int type not found."
+#   ifdef _CRAY
+typedef unsigned long  u_int16_t;
+#   else
+#    error "16 bit int type not found."
+#   endif
 #  endif
 #  if (SIZEOF_INT == 4)
 typedef unsigned int u_int32_t;
 #  else
-#   error "32 bit int type not found."
+#   ifdef _CRAY
+typedef unsigned long  u_int32_t;
+#   else
+#    error "32 bit int type not found."
+#   endif
 #  endif
 # endif
 #endif

diff --git a/session.c b/session.c
index 01442aa9ee909d46d285c3fc69951faa7f0001d0..3434aafc4f9ff7e9042f26c888eb8cb7493798ea 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1366,13 +1366,13 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                            "Running %.100s add %.100s %.100s %.100s\n",
                                            options.xauth_location, display,
                                            auth_proto, auth_data);
-#ifndef HAVE_CYGWIN /* Unix sockets are not supported */
+#ifndef NO_X11_UNIX_SOCKETS
                                        if (screen != NULL)
                                                fprintf(stderr,
                                                    "Adding %.*s/unix%s %s %s\n",
                                                    (int)(screen-display), display,
                                                    screen, auth_proto, auth_data);
-#endif
+#endif /* NO_X11_UNIX_SOCKETS */
                                }
                                snprintf(cmd, sizeof cmd, "%s -q -",
                                    options.xauth_location);
@@ -1380,12 +1380,12 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                if (f) {
                                        fprintf(f, "add %s %s %s\n", display,
                                            auth_proto, auth_data);
-#ifndef HAVE_CYGWIN /* Unix sockets are not supported */
+#ifndef NO_X11_UNIX_SOCKETS
                                        if (screen != NULL)
                                                fprintf(f, "add %.*s/unix%s %s %s\n",
                                                    (int)(screen-display), display,
                                                    screen, auth_proto, auth_data);
-#endif
+#endif /* NO_X11_UNIX_SOCKETS */
                                        pclose(f);
                                } else {
                                        fprintf(stderr, "Could not run %s\n",