diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-24 00:55:04 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-24 00:55:04 +0000 |
| commit | 38e60935bbece7ca891bf9264366c26d7a42414e (patch) | |
| tree | ae4cd7626fefeacc689004b87bf4c780a540244b | |
| parent | 803f16cbe4acdcfaf21e87c5f655c63b85f8d1a3 (diff) | |
- (bal) Generalize lack of UNIX sockets since this also effects Cray
not just Cygwin. Based on patch by Wendy Palm <wendyp@cray.com>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | defines.h | 26 | ||||
| -rw-r--r-- | session.c | 8 |
4 files changed, 30 insertions, 11 deletions
@@ -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 @@ -4112,4 +4114,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.817 2001/02/24 00:24:19 mouring Exp $ +$Id: ChangeLog,v 1.818 2001/02/24 00:55:04 mouring Exp $ diff --git a/configure.in b/configure.in index 5d728336..e236fa49 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.251 2001/02/23 05:05:53 mouring Exp $ +# $Id: configure.in,v 1.252 2001/02/24 00:55:05 mouring Exp $ AC_INIT(ssh.c) @@ -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 ;; @@ -1,7 +1,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.55 2001/02/16 01:34:57 djm Exp $ */ +/* $Id: defines.h,v 1.56 2001/02/24 00:55:05 mouring Exp $ */ /* Some platforms need this for the _r() functions */ #if !defined(_REENTRANT) && !defined(SNI) @@ -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 @@ -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", |