tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Irix portability fixes - don't include netinet headers more than once 

- Make sure we don't save PRNG seed more than once
This commit is contained in:
Damien Miller 2000-05-02 00:03:55 +10:00
parent 7c0042629e
commit fc0b11b5aa
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -20,6 +20,8 @@
<gd@hilb1.medat.de> <gd@hilb1.medat.de>
- Add some missing ifdefs to auth2.c - Add some missing ifdefs to auth2.c
- Deprecate perl-tk askpass. - Deprecate perl-tk askpass.
- Irix portability fixes - don't include netinet headers more than once
- Make sure we don't save PRNG seed more than once
20000430 20000430
- Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au> - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au>

3
configure.in
View File

@ -43,7 +43,6 @@ case "$host" in
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
AC_DEFINE(IPADDR_IN_DISPLAY) AC_DEFINE(IPADDR_IN_DISPLAY)
AC_DEFINE(USE_UTMPX) AC_DEFINE(USE_UTMPX)
AC_DEFINE(NEED_IN_SYSTM_H)
AC_MSG_CHECKING(for HPUX trusted system password database) AC_MSG_CHECKING(for HPUX trusted system password database)
if test -f /tcb/files/auth/system/default; then if test -f /tcb/files/auth/system/default; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
@ -130,7 +129,7 @@ if test -z "$no_libnsl" ; then
fi fi
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h) AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h)
# Checks for library functions. # Checks for library functions.
AC_CHECK_FUNCS(arc4random bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf vhangup _getpty) AC_CHECK_FUNCS(arc4random bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf vhangup _getpty)

5
defines.h
View File

@ -7,11 +7,8 @@
#include <sys/socket.h> /* For SHUT_XXXX */ #include <sys/socket.h> /* For SHUT_XXXX */
# include <netinet/in_systm.h> /* For typedefs */
#include <netinet/in.h> /* For IPv6 macros */ #include <netinet/in.h> /* For IPv6 macros */
#ifdef NEED_IN_SYSTM_H
# include <netinet/in_systm.h>
#endif
#include <netinet/ip.h> /* For IPTOS macros */ #include <netinet/ip.h> /* For IPTOS macros */
#ifdef HAVE_SYS_BITYPES_H #ifdef HAVE_SYS_BITYPES_H

4
entropy.c
View File

@ -35,7 +35,7 @@
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/sha.h> #include <openssl/sha.h>
RCSID("$Id: entropy.c,v 1.6 2000/04/29 23:30:46 damien Exp $"); RCSID("$Id: entropy.c,v 1.7 2000/05/01 14:03:56 damien Exp $");
#ifdef EGD_SOCKET #ifdef EGD_SOCKET
#ifndef offsetof #ifndef offsetof
@ -520,6 +520,8 @@ prng_write_seedfile(void) {
if (prng_seed_saved) if (prng_seed_saved)
return; return;
prng_seed_saved = 1;
pw = getpwuid(getuid()); pw = getpwuid(getuid());
if (pw == NULL) if (pw == NULL)
fatal("Couldn't get password entry for current user (%i): %s", fatal("Couldn't get password entry for current user (%i): %s",

3
includes.h
View File

@ -30,10 +30,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#include <sys/un.h> #include <sys/un.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <netinet/ip.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>