RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Bug #456: Support for NEC SX6 with Unicos; from wendyp@cray.com

This commit is contained in:
Damien Miller 2003-02-24 15:45:42 +11:00
parent 1a3ccb07c5
commit fe1f14375a
5 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -86,6 +86,7 @@
- (djm) Rest of Bug #499: Import a basename() function from OpenBSD libc - (djm) Rest of Bug #499: Import a basename() function from OpenBSD libc
- (djm) Bug #494: Allow multiple accounts on Windows 9x/Me; - (djm) Bug #494: Allow multiple accounts on Windows 9x/Me;
From vinschen@redhat.com From vinschen@redhat.com
- (djm) Bug #456: Support for NEC SX6 with Unicos; from wendyp@cray.com
20030211 20030211
- (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@ -1186,4 +1187,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2620 2003/02/24 02:04:01 djm Exp $ $Id: ChangeLog,v 1.2621 2003/02/24 04:45:42 djm Exp $

4
config.sub vendored
View File

@ -887,6 +887,10 @@ case $basic_machine in
basic_machine=sv1-cray basic_machine=sv1-cray
os=-unicos os=-unicos
;; ;;
sx*-nec)
basic_machine=sx6-nec
os=-sysv
;;
symmetry) symmetry)
basic_machine=i386-sequent basic_machine=i386-sequent
os=-dynix os=-dynix

28
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.108 2003/02/24 01:55:55 djm Exp $ # $Id: configure.ac,v 1.109 2003/02/24 04:45:43 djm Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -600,18 +600,20 @@ AC_ARG_WITH(tcp-wrappers,
] ]
) )
dnl Checks for library functions. dnl Checks for library functions. Please keep in alphabetical order
AC_CHECK_FUNCS(arc4random b64_ntop bcopy basename bindresvport_sa \ AC_CHECK_FUNCS(\
clock fchmod fchown freeaddrinfo futimes gai_strerror \ arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename bcopy \
getaddrinfo getcwd getgrouplist getnameinfo getopt getpeereid\ bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
getrlimit getrusage getttyent glob inet_aton inet_ntoa \ gai_strerror getaddrinfo getcwd getgrouplist getnameinfo getopt \
inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp \ getpeereid _getpty getrlimit getrusage getttyent glob inet_aton \
mmap ngetaddrinfo nsleep openpty ogetaddrinfo pstat readpassphrase \ inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove \
realpath recvmsg rresvport_af sendmsg setdtablesize setegid \ mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openpty pstat \
setenv seteuid setgroups setlogin setproctitle setresgid setreuid \ readpassphrase realpath recvmsg rresvport_af sendmsg setdtablesize \
setrlimit setsid setpcred setvbuf sigaction sigvec snprintf \ setegid setenv seteuid setgroups setlogin setpcred setproctitle \
socketpair strerror strlcat strlcpy strmode strnvis sysconf tcgetpgrp \ setresgid setreuid setrlimit setsid setvbuf sigaction sigvec \
truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty) snprintf socketpair strerror strlcat strlcpy strmode strnvis \
sysconf tcgetpgrp truncate utimes vhangup vsnprintf waitpid \
)
AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP)) AC_SEARCH_LIBS(nanosleep, rt posix4, AC_DEFINE(HAVE_NANOSLEEP))

9
openbsd-compat/base64.c
View File

@ -44,7 +44,7 @@
#include "includes.h" #include "includes.h"
#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) #if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON))
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -130,6 +130,7 @@ static const char Pad64 = '=';
characters followed by one "=" padding character. characters followed by one "=" padding character.
*/ */
#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)
int int
b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
{ {
@ -190,6 +191,9 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
target[datalength] = '\0'; /* Returned value doesn't count \0. */ target[datalength] = '\0'; /* Returned value doesn't count \0. */
return (datalength); return (datalength);
} }
#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */
#if !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON)
/* skips all whitespace anywhere. /* skips all whitespace anywhere.
converts characters, four at a time, starting at (or after) converts characters, four at a time, starting at (or after)
@ -314,4 +318,5 @@ b64_pton(char const *src, u_char *target, size_t targsize)
return (tarindex); return (tarindex);
} }
#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */ #endif /* !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) */
#endif

11
openbsd-compat/base64.h
View File

@ -1,4 +1,4 @@
/* $Id: base64.h,v 1.3 2002/02/26 16:59:59 stevesk Exp $ */ /* $Id: base64.h,v 1.4 2003/02/24 04:45:43 djm Exp $ */
#ifndef _BSD_BASE64_H #ifndef _BSD_BASE64_H
#define _BSD_BASE64_H #define _BSD_BASE64_H
@ -9,10 +9,15 @@
# ifndef HAVE_B64_NTOP # ifndef HAVE_B64_NTOP
int b64_ntop(u_char const *src, size_t srclength, char *target, int b64_ntop(u_char const *src, size_t srclength, char *target,
size_t targsize); size_t targsize);
int b64_pton(char const *src, u_char *target, size_t targsize);
# endif /* !HAVE_B64_NTOP */ # endif /* !HAVE_B64_NTOP */
# define __b64_ntop b64_ntop # define __b64_ntop b64_ntop
# define __b64_pton b64_pton
#endif /* HAVE___B64_NTOP */ #endif /* HAVE___B64_NTOP */
#ifndef HAVE___B64_PTON
# ifndef HAVE_B64_PTON
int b64_pton(char const *src, u_char *target, size_t targsize);
# endif /* !HAVE_B64_PTON */
# define __b64_pton b64_pton
#endif /* HAVE___B64_PTON */
#endif /* _BSD_BASE64_H */ #endif /* _BSD_BASE64_H */