diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | acconfig.h | 3 | ||||
-rw-r--r-- | bsd-misc.c | 7 | ||||
-rw-r--r-- | bsd-misc.h | 4 | ||||
-rw-r--r-- | configure.in | 16 | ||||
-rw-r--r-- | entropy.c | 7 | ||||
-rw-r--r-- | ssh_prng_cmds.in | 1 |
7 files changed, 39 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | 20000713 | 1 | 20000715 |
2 | - (djm) OpenBSD CVS updates | 2 | - (djm) OpenBSD CVS updates |
3 | - provos@cvs.openbsd.org 2000/07/13 16:53:22 | 3 | - provos@cvs.openbsd.org 2000/07/13 16:53:22 |
4 | [aux.c readconf.c servconf.c ssh.h] | 4 | [aux.c readconf.c servconf.c ssh.h] |
@@ -16,6 +16,9 @@ | |||
16 | - djm@cvs.openbsd.org 2000/07/14 22:01:38 | 16 | - djm@cvs.openbsd.org 2000/07/14 22:01:38 |
17 | [ssh-keygen.c ssh.c] | 17 | [ssh-keygen.c ssh.c] |
18 | Always create ~/.ssh with mode 700; ok Markus | 18 | Always create ~/.ssh with mode 700; ok Markus |
19 | - Fixes for SunOS 4.1.4 from Gordon Atwood <gordon@cs.ualberta.ca> | ||
20 | - Include floatingpoint.h for entropy.c | ||
21 | - strerror replacement | ||
19 | 22 | ||
20 | 20000712 | 23 | 20000712 |
21 | - (djm) Remove -lresolve for Reliant Unix | 24 | - (djm) Remove -lresolve for Reliant Unix |
diff --git a/acconfig.h b/acconfig.h index 4528be678..358390bc4 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -6,6 +6,9 @@ | |||
6 | 6 | ||
7 | @TOP@ | 7 | @TOP@ |
8 | 8 | ||
9 | /* Define if your system defines sys_errlist[] */ | ||
10 | #undef HAVE_SYS_ERRLIST | ||
11 | |||
9 | /* Define if your system choked on IP TOS setting */ | 12 | /* Define if your system choked on IP TOS setting */ |
10 | #undef IP_TOS_IS_BROKEN | 13 | #undef IP_TOS_IS_BROKEN |
11 | 14 | ||
diff --git a/bsd-misc.c b/bsd-misc.c index c22cde328..e6b529e1e 100644 --- a/bsd-misc.c +++ b/bsd-misc.c | |||
@@ -157,3 +157,10 @@ int seteuid(uid_t euid) | |||
157 | return(setreuid(-1,euid)); | 157 | return(setreuid(-1,euid)); |
158 | } | 158 | } |
159 | #endif /* !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) */ | 159 | #endif /* !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) */ |
160 | |||
161 | #if !defined(HAVE_STRERROR) && defined(HAVE_SYS_ERRLIST) | ||
162 | const char *strerror(void) | ||
163 | { | ||
164 | return(sys_errlist[errno]); | ||
165 | } | ||
166 | #endif /* !defined(HAVE_STRERROR) && defined(HAVE_SYS_ERRLIST) */ | ||
diff --git a/bsd-misc.h b/bsd-misc.h index cdf8e2b67..76b4e1a78 100644 --- a/bsd-misc.h +++ b/bsd-misc.h | |||
@@ -58,4 +58,8 @@ int innetgr(const char *netgroup, const char *host, | |||
58 | int seteuid(uid_t euid); | 58 | int seteuid(uid_t euid); |
59 | #endif /* !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) */ | 59 | #endif /* !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) */ |
60 | 60 | ||
61 | #if !defined(HAVE_STRERROR) && defined(HAVE_SYS_ERRLIST) | ||
62 | const char *strerror(void); | ||
63 | #endif /* !defined(HAVE_STRERROR) && defined(HAVE_SYS_ERRLIST) */ | ||
64 | |||
61 | #endif /* _BSD_MISC_H */ | 65 | #endif /* _BSD_MISC_H */ |
diff --git a/configure.in b/configure.in index 0b8047a36..92659857c 100644 --- a/configure.in +++ b/configure.in | |||
@@ -216,10 +216,10 @@ if test -z "$no_libnsl" ; then | |||
216 | fi | 216 | fi |
217 | 217 | ||
218 | # Checks for header files. | 218 | # Checks for header files. |
219 | AC_CHECK_HEADERS(bstring.h endian.h lastlog.h limits.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/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h usersec.h util.h utmp.h utmpx.h) | 219 | AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h lastlog.h limits.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/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h usersec.h util.h utmp.h utmpx.h) |
220 | 220 | ||
221 | # Checks for library functions. | 221 | # Checks for library functions. |
222 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage inet_aton innetgr md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid sigaction sigvec snprintf strlcat strlcpy strsep vsnprintf vhangup _getpty __b64_ntop) | 222 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage inet_aton innetgr md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid sigaction sigvec snprintf strerror strlcat strlcpy strsep vsnprintf vhangup _getpty __b64_ntop) |
223 | dnl checks for time functions | 223 | dnl checks for time functions |
224 | AC_CHECK_FUNCS(gettimeofday time) | 224 | AC_CHECK_FUNCS(gettimeofday time) |
225 | dnl checks for libutil functions | 225 | dnl checks for libutil functions |
@@ -724,6 +724,18 @@ if test "x$ac_cv_libc_defines___progname" = "xyes" ; then | |||
724 | fi | 724 | fi |
725 | 725 | ||
726 | 726 | ||
727 | AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [ | ||
728 | AC_TRY_LINK([], | ||
729 | [ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);], | ||
730 | [ ac_cv_libc_defines_sys_errlist="yes" ], | ||
731 | [ ac_cv_libc_defines_sys_errlist="no" ] | ||
732 | ) | ||
733 | ]) | ||
734 | if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then | ||
735 | AC_DEFINE(HAVE_SYS_ERRLIST) | ||
736 | fi | ||
737 | |||
738 | |||
727 | # Looking for programs, paths and files | 739 | # Looking for programs, paths and files |
728 | AC_ARG_WITH(rsh, | 740 | AC_ARG_WITH(rsh, |
729 | [ --with-rsh=PATH Specify path to remote shell program ], | 741 | [ --with-rsh=PATH Specify path to remote shell program ], |
@@ -35,7 +35,12 @@ | |||
35 | #include <openssl/rand.h> | 35 | #include <openssl/rand.h> |
36 | #include <openssl/sha.h> | 36 | #include <openssl/sha.h> |
37 | 37 | ||
38 | RCSID("$Id: entropy.c,v 1.17 2000/07/09 12:42:33 djm Exp $"); | 38 | /* SunOS 4.4.4 needs this */ |
39 | #ifdef HAVE_FLOATINGPOINT_H | ||
40 | # include <floatingpoint.h> | ||
41 | #endif /* HAVE_FLOATINGPOINT_H */ | ||
42 | |||
43 | RCSID("$Id: entropy.c,v 1.18 2000/07/15 04:59:15 djm Exp $"); | ||
39 | 44 | ||
40 | #ifndef offsetof | 45 | #ifndef offsetof |
41 | # define offsetof(type, member) ((size_t) &((type *)0)->member) | 46 | # define offsetof(type, member) ((size_t) &((type *)0)->member) |
diff --git a/ssh_prng_cmds.in b/ssh_prng_cmds.in index df45ed22e..d7389d7e9 100644 --- a/ssh_prng_cmds.in +++ b/ssh_prng_cmds.in | |||
@@ -15,6 +15,7 @@ | |||
15 | "netstat -an" @PROG_NETSTAT@ 0.05 | 15 | "netstat -an" @PROG_NETSTAT@ 0.05 |
16 | "netstat -in" @PROG_NETSTAT@ 0.05 | 16 | "netstat -in" @PROG_NETSTAT@ 0.05 |
17 | "netstat -rn" @PROG_NETSTAT@ 0.02 | 17 | "netstat -rn" @PROG_NETSTAT@ 0.02 |
18 | "netstat -pn" @PROG_NETSTAT@ 0.02 | ||
18 | "netstat -s" @PROG_NETSTAT@ 0.02 | 19 | "netstat -s" @PROG_NETSTAT@ 0.02 |
19 | 20 | ||
20 | "arp -a -n" @PROG_ARP@ 0.02 | 21 | "arp -a -n" @PROG_ARP@ 0.02 |