зеркало из https://github.com/Azure/sonic-openssh.git
- (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync
with Cray (mostly #ifdef renaming). Patch by wendyp@cray.com.
This commit is contained in:
Ben Lindstrom
Родитель
066e1ab8a3
Коммит
232ccf7754
|
|
@ -1,6 +1,8 @@
|
|||
20020722
|
||||
- (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk
|
||||
- (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
|
||||
- (stevesk) [auth-pam.c] merge cosmetic changes from solar's
|
||||
|
|
@ -1412,4 +1414,4 @@
|
|||
- (stevesk) entropy.c: typo in debug message
|
||||
- (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
15
configure.ac
|
|
@ -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_CONFIG_SRCDIR([ssh.c])
|
||||
|
|
@ -279,13 +279,22 @@ mips-sony-bsd|mips-sony-newsos4)
|
|||
AC_CHECK_FUNCS(getluid setluid)
|
||||
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*)
|
||||
no_libsocket=1
|
||||
no_libnsl=1
|
||||
AC_DEFINE(USE_PIPES)
|
||||
AC_DEFINE(DISABLE_FD_PASSING)
|
||||
LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib"
|
||||
LIBS="$LIBS -lgen -lrsc"
|
||||
LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal"
|
||||
LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm"
|
||||
MANTYPE=cat
|
||||
;;
|
||||
*-dec-osf*)
|
||||
AC_MSG_CHECKING(for Digital Unix SIA)
|
||||
|
|
|
|||
10
defines.h
10
defines.h
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _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 */
|
||||
|
|
@ -124,7 +124,7 @@ typedef char int8_t;
|
|||
# if (SIZEOF_SHORT_INT == 2)
|
||||
typedef short int int16_t;
|
||||
# else
|
||||
# ifdef _CRAY
|
||||
# if defined(_CRAY) && !defined(_CRAYSV2)
|
||||
# if (SIZEOF_SHORT_INT == 4)
|
||||
typedef short int16_t;
|
||||
# else
|
||||
|
|
@ -137,7 +137,7 @@ typedef long int16_t;
|
|||
# if (SIZEOF_INT == 4)
|
||||
typedef int int32_t;
|
||||
# else
|
||||
# ifdef _CRAY
|
||||
# if defined(_CRAY) && !defined(_CRAYSV2)
|
||||
typedef long int32_t;
|
||||
# else
|
||||
# error "32 bit int type not found."
|
||||
|
|
@ -161,7 +161,7 @@ typedef unsigned char u_int8_t;
|
|||
# if (SIZEOF_SHORT_INT == 2)
|
||||
typedef unsigned short int u_int16_t;
|
||||
# else
|
||||
# ifdef _CRAY
|
||||
# if defined(_CRAY) && !defined(_CRAYSV2)
|
||||
# if (SIZEOF_SHORT_INT == 4)
|
||||
typedef unsigned short u_int16_t;
|
||||
# else
|
||||
|
|
@ -174,7 +174,7 @@ typedef unsigned long u_int16_t;
|
|||
# if (SIZEOF_INT == 4)
|
||||
typedef unsigned int u_int32_t;
|
||||
# else
|
||||
# ifdef _CRAY
|
||||
# if defined(_CRAY) && !defined(_CRAYSV2)
|
||||
typedef unsigned long u_int32_t;
|
||||
# else
|
||||
# error "32 bit int type not found."
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@
|
|||
#include "log.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
|
||||
# include <util.h>
|
||||
|
|
@ -622,13 +622,13 @@ construct_utmp(struct logininfo *li,
|
|||
switch (li->type) {
|
||||
case LTYPE_LOGIN:
|
||||
ut->ut_type = USER_PROCESS;
|
||||
#ifdef _CRAY
|
||||
#if defined(_CRAY) && !defined(_CRAYSV2)
|
||||
cray_set_tmpdir(ut);
|
||||
#endif
|
||||
break;
|
||||
case LTYPE_LOGOUT:
|
||||
ut->ut_type = DEAD_PROCESS;
|
||||
#ifdef _CRAY
|
||||
#if defined(_CRAY) && !defined(_CRAYSV2)
|
||||
cray_retain_utmp(ut, li->pid);
|
||||
#endif
|
||||
break;
|
||||
|
|
|
|||
2
sshd.c
2
sshd.c
|
|
@ -934,7 +934,7 @@ main(int ac, char **av)
|
|||
SYSLOG_FACILITY_AUTH : options.log_facility,
|
||||
!inetd_flag);
|
||||
|
||||
#ifdef _CRAY
|
||||
#if defined(_CRAY) && !defined(_CRAYSV2)
|
||||
/* Cray can define user privs drop all prives now!
|
||||
* Not needed on PRIV_SU systems!
|
||||
*/
|
||||
|
|
|
|||
4
sshpty.c
4
sshpty.c
|
|
@ -162,7 +162,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
|
|||
}
|
||||
return 1;
|
||||
#else /* HAVE_DEV_PTS_AND_PTC */
|
||||
#ifdef _CRAY
|
||||
#if defined(_CRAY) && !defined(_CRAYSV2)
|
||||
char buf[64];
|
||||
int i;
|
||||
int highpty;
|
||||
|
|
@ -268,7 +268,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
|
|||
void *old;
|
||||
#endif /* USE_VHANGUP */
|
||||
|
||||
#ifdef _CRAY
|
||||
#if defined(_CRAY) && !defined(_CRAYSV2)
|
||||
if (setsid() < 0)
|
||||
error("setsid: %.100s", strerror(errno));
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче