diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 15 | ||||
-rw-r--r-- | defines.h | 10 | ||||
-rw-r--r-- | loginrec.c | 6 | ||||
-rw-r--r-- | sshd.c | 2 | ||||
-rw-r--r-- | sshpty.c | 4 |
6 files changed, 26 insertions, 15 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20020722 | 1 | 20020722 |
2 | - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk | 2 | - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk |
3 | - (stevesk) [xmmap.c] missing prototype for fatal() | 3 | - (stevesk) [xmmap.c] missing prototype for fatal() |
4 | - (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync | ||
5 | with Cray (mostly #ifdef renaming). Patch by wendyp@cray.com. | ||
4 | 6 | ||
5 | 20020721 | 7 | 20020721 |
6 | - (stevesk) [auth-pam.c] merge cosmetic changes from solar's | 8 | - (stevesk) [auth-pam.c] merge cosmetic changes from solar's |
@@ -1412,4 +1414,4 @@ | |||
1412 | - (stevesk) entropy.c: typo in debug message | 1414 | - (stevesk) entropy.c: typo in debug message |
1413 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1415 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1414 | 1416 | ||
1415 | $Id: ChangeLog,v 1.2388 2002/07/22 16:20:29 stevesk Exp $ | 1417 | $Id: ChangeLog,v 1.2389 2002/07/22 23:34:25 mouring Exp $ |
diff --git a/configure.ac b/configure.ac index c055c578b..c8aa7e184 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.82 2002/07/19 19:41:11 tim Exp $ | 1 | # $Id: configure.ac,v 1.83 2002/07/22 23:34:25 mouring Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -279,13 +279,22 @@ mips-sony-bsd|mips-sony-newsos4) | |||
279 | AC_CHECK_FUNCS(getluid setluid) | 279 | AC_CHECK_FUNCS(getluid setluid) |
280 | MANTYPE=man | 280 | MANTYPE=man |
281 | ;; | 281 | ;; |
282 | *-*-unicosmk*) | ||
283 | no_libsocket=1 | ||
284 | no_libnsl=1 | ||
285 | AC_DEFINE(USE_PIPES) | ||
286 | AC_DEFINE(DISABLE_FD_PASSING) | ||
287 | LDFLAGS="$LDFLAGS" | ||
288 | LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm" | ||
289 | MANTYPE=cat | ||
282 | *-*-unicos*) | 290 | *-*-unicos*) |
283 | no_libsocket=1 | 291 | no_libsocket=1 |
284 | no_libnsl=1 | 292 | no_libnsl=1 |
285 | AC_DEFINE(USE_PIPES) | 293 | AC_DEFINE(USE_PIPES) |
286 | AC_DEFINE(DISABLE_FD_PASSING) | 294 | AC_DEFINE(DISABLE_FD_PASSING) |
287 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" | 295 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal" |
288 | LIBS="$LIBS -lgen -lrsc" | 296 | LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm" |
297 | MANTYPE=cat | ||
289 | ;; | 298 | ;; |
290 | *-dec-osf*) | 299 | *-dec-osf*) |
291 | AC_MSG_CHECKING(for Digital Unix SIA) | 300 | AC_MSG_CHECKING(for Digital Unix SIA) |
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _DEFINES_H | 1 | #ifndef _DEFINES_H |
2 | #define _DEFINES_H | 2 | #define _DEFINES_H |
3 | 3 | ||
4 | /* $Id: defines.h,v 1.93 2002/07/18 16:31:52 tim Exp $ */ | 4 | /* $Id: defines.h,v 1.94 2002/07/22 23:34:25 mouring Exp $ */ |
5 | 5 | ||
6 | 6 | ||
7 | /* Constants */ | 7 | /* Constants */ |
@@ -124,7 +124,7 @@ typedef char int8_t; | |||
124 | # if (SIZEOF_SHORT_INT == 2) | 124 | # if (SIZEOF_SHORT_INT == 2) |
125 | typedef short int int16_t; | 125 | typedef short int int16_t; |
126 | # else | 126 | # else |
127 | # ifdef _CRAY | 127 | # if defined(_CRAY) && !defined(_CRAYSV2) |
128 | # if (SIZEOF_SHORT_INT == 4) | 128 | # if (SIZEOF_SHORT_INT == 4) |
129 | typedef short int16_t; | 129 | typedef short int16_t; |
130 | # else | 130 | # else |
@@ -137,7 +137,7 @@ typedef long int16_t; | |||
137 | # if (SIZEOF_INT == 4) | 137 | # if (SIZEOF_INT == 4) |
138 | typedef int int32_t; | 138 | typedef int int32_t; |
139 | # else | 139 | # else |
140 | # ifdef _CRAY | 140 | # if defined(_CRAY) && !defined(_CRAYSV2) |
141 | typedef long int32_t; | 141 | typedef long int32_t; |
142 | # else | 142 | # else |
143 | # error "32 bit int type not found." | 143 | # error "32 bit int type not found." |
@@ -161,7 +161,7 @@ typedef unsigned char u_int8_t; | |||
161 | # if (SIZEOF_SHORT_INT == 2) | 161 | # if (SIZEOF_SHORT_INT == 2) |
162 | typedef unsigned short int u_int16_t; | 162 | typedef unsigned short int u_int16_t; |
163 | # else | 163 | # else |
164 | # ifdef _CRAY | 164 | # if defined(_CRAY) && !defined(_CRAYSV2) |
165 | # if (SIZEOF_SHORT_INT == 4) | 165 | # if (SIZEOF_SHORT_INT == 4) |
166 | typedef unsigned short u_int16_t; | 166 | typedef unsigned short u_int16_t; |
167 | # else | 167 | # else |
@@ -174,7 +174,7 @@ typedef unsigned long u_int16_t; | |||
174 | # if (SIZEOF_INT == 4) | 174 | # if (SIZEOF_INT == 4) |
175 | typedef unsigned int u_int32_t; | 175 | typedef unsigned int u_int32_t; |
176 | # else | 176 | # else |
177 | # ifdef _CRAY | 177 | # if defined(_CRAY) && !defined(_CRAYSV2) |
178 | typedef unsigned long u_int32_t; | 178 | typedef unsigned long u_int32_t; |
179 | # else | 179 | # else |
180 | # error "32 bit int type not found." | 180 | # error "32 bit int type not found." |
diff --git a/loginrec.c b/loginrec.c index df4abeb79..6dc608a4e 100644 --- a/loginrec.c +++ b/loginrec.c | |||
@@ -163,7 +163,7 @@ | |||
163 | #include "log.h" | 163 | #include "log.h" |
164 | #include "atomicio.h" | 164 | #include "atomicio.h" |
165 | 165 | ||
166 | RCSID("$Id: loginrec.c,v 1.42 2002/07/14 22:50:51 tim Exp $"); | 166 | RCSID("$Id: loginrec.c,v 1.43 2002/07/22 23:34:25 mouring Exp $"); |
167 | 167 | ||
168 | #ifdef HAVE_UTIL_H | 168 | #ifdef HAVE_UTIL_H |
169 | # include <util.h> | 169 | # include <util.h> |
@@ -622,13 +622,13 @@ construct_utmp(struct logininfo *li, | |||
622 | switch (li->type) { | 622 | switch (li->type) { |
623 | case LTYPE_LOGIN: | 623 | case LTYPE_LOGIN: |
624 | ut->ut_type = USER_PROCESS; | 624 | ut->ut_type = USER_PROCESS; |
625 | #ifdef _CRAY | 625 | #if defined(_CRAY) && !defined(_CRAYSV2) |
626 | cray_set_tmpdir(ut); | 626 | cray_set_tmpdir(ut); |
627 | #endif | 627 | #endif |
628 | break; | 628 | break; |
629 | case LTYPE_LOGOUT: | 629 | case LTYPE_LOGOUT: |
630 | ut->ut_type = DEAD_PROCESS; | 630 | ut->ut_type = DEAD_PROCESS; |
631 | #ifdef _CRAY | 631 | #if defined(_CRAY) && !defined(_CRAYSV2) |
632 | cray_retain_utmp(ut, li->pid); | 632 | cray_retain_utmp(ut, li->pid); |
633 | #endif | 633 | #endif |
634 | break; | 634 | break; |
@@ -934,7 +934,7 @@ main(int ac, char **av) | |||
934 | SYSLOG_FACILITY_AUTH : options.log_facility, | 934 | SYSLOG_FACILITY_AUTH : options.log_facility, |
935 | !inetd_flag); | 935 | !inetd_flag); |
936 | 936 | ||
937 | #ifdef _CRAY | 937 | #if defined(_CRAY) && !defined(_CRAYSV2) |
938 | /* Cray can define user privs drop all prives now! | 938 | /* Cray can define user privs drop all prives now! |
939 | * Not needed on PRIV_SU systems! | 939 | * Not needed on PRIV_SU systems! |
940 | */ | 940 | */ |
@@ -162,7 +162,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) | |||
162 | } | 162 | } |
163 | return 1; | 163 | return 1; |
164 | #else /* HAVE_DEV_PTS_AND_PTC */ | 164 | #else /* HAVE_DEV_PTS_AND_PTC */ |
165 | #ifdef _CRAY | 165 | #if defined(_CRAY) && !defined(_CRAYSV2) |
166 | char buf[64]; | 166 | char buf[64]; |
167 | int i; | 167 | int i; |
168 | int highpty; | 168 | int highpty; |
@@ -268,7 +268,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) | |||
268 | void *old; | 268 | void *old; |
269 | #endif /* USE_VHANGUP */ | 269 | #endif /* USE_VHANGUP */ |
270 | 270 | ||
271 | #ifdef _CRAY | 271 | #if defined(_CRAY) && !defined(_CRAYSV2) |
272 | if (setsid() < 0) | 272 | if (setsid() < 0) |
273 | error("setsid: %.100s", strerror(errno)); | 273 | error("setsid: %.100s", strerror(errno)); |
274 | 274 | ||