RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-11 20:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync

Browse Source 
with Cray (mostly #ifdef renaming).  Patch by wendyp@cray.com.
This commit is contained in:
Ben Lindstrom 2002-07-22 23:34:25 +00:00
parent 066e1ab8a3
commit 232ccf7754
6 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,8 @@
20020722 20020722
- (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk
- (stevesk) [xmmap.c] missing prototype for fatal() - (stevesk) [xmmap.c] missing prototype for fatal()
- (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync
with Cray (mostly #ifdef renaming). Patch by wendyp@cray.com.
20020721 20020721
- (stevesk) [auth-pam.c] merge cosmetic changes from solar's - (stevesk) [auth-pam.c] merge cosmetic changes from solar's
@ -1412,4 +1414,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2388 2002/07/22 16:20:29 stevesk Exp $ $Id: ChangeLog,v 1.2389 2002/07/22 23:34:25 mouring Exp $

15
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.82 2002/07/19 19:41:11 tim Exp $ # $Id: configure.ac,v 1.83 2002/07/22 23:34:25 mouring Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -279,13 +279,22 @@ mips-sony-bsd|mips-sony-newsos4)
AC_CHECK_FUNCS(getluid setluid) AC_CHECK_FUNCS(getluid setluid)
MANTYPE=man MANTYPE=man
;; ;;
*-*-unicosmk*)
no_libsocket=1
no_libnsl=1
AC_DEFINE(USE_PIPES)
AC_DEFINE(DISABLE_FD_PASSING)
LDFLAGS="$LDFLAGS"
LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm"
MANTYPE=cat
*-*-unicos*) *-*-unicos*)
no_libsocket=1 no_libsocket=1
no_libnsl=1 no_libnsl=1
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(DISABLE_FD_PASSING) AC_DEFINE(DISABLE_FD_PASSING)
LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal"
LIBS="$LIBS -lgen -lrsc" LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm"
MANTYPE=cat
;; ;;
*-dec-osf*) *-dec-osf*)
AC_MSG_CHECKING(for Digital Unix SIA) AC_MSG_CHECKING(for Digital Unix SIA)

10
defines.h
View File

@ -1,7 +1,7 @@
#ifndef _DEFINES_H #ifndef _DEFINES_H
#define _DEFINES_H #define _DEFINES_H
/* $Id: defines.h,v 1.93 2002/07/18 16:31:52 tim Exp $ */ /* $Id: defines.h,v 1.94 2002/07/22 23:34:25 mouring Exp $ */
/* Constants */ /* Constants */
@ -124,7 +124,7 @@ typedef char int8_t;
# if (SIZEOF_SHORT_INT == 2) # if (SIZEOF_SHORT_INT == 2)
typedef short int int16_t; typedef short int int16_t;
# else # else
# ifdef _CRAY # if defined(_CRAY) && !defined(_CRAYSV2)
# if (SIZEOF_SHORT_INT == 4) # if (SIZEOF_SHORT_INT == 4)
typedef short int16_t; typedef short int16_t;
# else # else
@ -137,7 +137,7 @@ typedef long int16_t;
# if (SIZEOF_INT == 4) # if (SIZEOF_INT == 4)
typedef int int32_t; typedef int int32_t;
# else # else
# ifdef _CRAY # if defined(_CRAY) && !defined(_CRAYSV2)
typedef long int32_t; typedef long int32_t;
# else # else
# error "32 bit int type not found." # error "32 bit int type not found."
@ -161,7 +161,7 @@ typedef unsigned char u_int8_t;
# if (SIZEOF_SHORT_INT == 2) # if (SIZEOF_SHORT_INT == 2)
typedef unsigned short int u_int16_t; typedef unsigned short int u_int16_t;
# else # else
# ifdef _CRAY # if defined(_CRAY) && !defined(_CRAYSV2)
# if (SIZEOF_SHORT_INT == 4) # if (SIZEOF_SHORT_INT == 4)
typedef unsigned short u_int16_t; typedef unsigned short u_int16_t;
# else # else
@ -174,7 +174,7 @@ typedef unsigned long u_int16_t;
# if (SIZEOF_INT == 4) # if (SIZEOF_INT == 4)
typedef unsigned int u_int32_t; typedef unsigned int u_int32_t;
# else # else
# ifdef _CRAY # if defined(_CRAY) && !defined(_CRAYSV2)
typedef unsigned long u_int32_t; typedef unsigned long u_int32_t;
# else # else
# error "32 bit int type not found." # error "32 bit int type not found."

6
loginrec.c
View File

@ -163,7 +163,7 @@
#include "log.h" #include "log.h"
#include "atomicio.h" #include "atomicio.h"
RCSID("$Id: loginrec.c,v 1.42 2002/07/14 22:50:51 tim Exp $"); RCSID("$Id: loginrec.c,v 1.43 2002/07/22 23:34:25 mouring Exp $");
#ifdef HAVE_UTIL_H #ifdef HAVE_UTIL_H
# include <util.h> # include <util.h>
@ -622,13 +622,13 @@ construct_utmp(struct logininfo *li,
switch (li->type) { switch (li->type) {
case LTYPE_LOGIN: case LTYPE_LOGIN:
ut->ut_type = USER_PROCESS; ut->ut_type = USER_PROCESS;
#ifdef _CRAY #if defined(_CRAY) && !defined(_CRAYSV2)
cray_set_tmpdir(ut); cray_set_tmpdir(ut);
#endif #endif
break; break;
case LTYPE_LOGOUT: case LTYPE_LOGOUT:
ut->ut_type = DEAD_PROCESS; ut->ut_type = DEAD_PROCESS;
#ifdef _CRAY #if defined(_CRAY) && !defined(_CRAYSV2)
cray_retain_utmp(ut, li->pid); cray_retain_utmp(ut, li->pid);
#endif #endif
break; break;

2
sshd.c
View File

@ -934,7 +934,7 @@ main(int ac, char **av)
SYSLOG_FACILITY_AUTH : options.log_facility, SYSLOG_FACILITY_AUTH : options.log_facility,
!inetd_flag); !inetd_flag);
#ifdef _CRAY #if defined(_CRAY) && !defined(_CRAYSV2)
/* Cray can define user privs drop all prives now! /* Cray can define user privs drop all prives now!
* Not needed on PRIV_SU systems! * Not needed on PRIV_SU systems!
*/ */

4
sshpty.c
View File

@ -162,7 +162,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
} }
return 1; return 1;
#else /* HAVE_DEV_PTS_AND_PTC */ #else /* HAVE_DEV_PTS_AND_PTC */
#ifdef _CRAY #if defined(_CRAY) && !defined(_CRAYSV2)
char buf[64]; char buf[64];
int i; int i;
int highpty; int highpty;
@ -268,7 +268,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
void *old; void *old;
#endif /* USE_VHANGUP */ #endif /* USE_VHANGUP */
#ifdef _CRAY #if defined(_CRAY) && !defined(_CRAYSV2)
if (setsid() < 0) if (setsid() < 0)
error("setsid: %.100s", strerror(errno)); error("setsid: %.100s", strerror(errno));