diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-02 00:03:55 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-02 00:03:55 +1000 |
commit | fc0b11b5aa95f43109b384c6c752d2c20963c31a (patch) | |
tree | c9d85b50b10e2b561401a3f8f7d5576549f3dae1 | |
parent | 7c0042629e1dfe12f42c3355cc843e269e50b914 (diff) |
- Irix portability fixes - don't include netinet headers more than once
- Make sure we don't save PRNG seed more than once
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | defines.h | 5 | ||||
-rw-r--r-- | entropy.c | 4 | ||||
-rw-r--r-- | includes.h | 3 |
5 files changed, 7 insertions, 10 deletions
@@ -20,6 +20,8 @@ | |||
20 | <gd@hilb1.medat.de> | 20 | <gd@hilb1.medat.de> |
21 | - Add some missing ifdefs to auth2.c | 21 | - Add some missing ifdefs to auth2.c |
22 | - Deprecate perl-tk askpass. | 22 | - Deprecate perl-tk askpass. |
23 | - Irix portability fixes - don't include netinet headers more than once | ||
24 | - Make sure we don't save PRNG seed more than once | ||
23 | 25 | ||
24 | 20000430 | 26 | 20000430 |
25 | - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au> | 27 | - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au> |
diff --git a/configure.in b/configure.in index 2e50df914..8046fa3e1 100644 --- a/configure.in +++ b/configure.in | |||
@@ -43,7 +43,6 @@ case "$host" in | |||
43 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 43 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
44 | AC_DEFINE(IPADDR_IN_DISPLAY) | 44 | AC_DEFINE(IPADDR_IN_DISPLAY) |
45 | AC_DEFINE(USE_UTMPX) | 45 | AC_DEFINE(USE_UTMPX) |
46 | AC_DEFINE(NEED_IN_SYSTM_H) | ||
47 | AC_MSG_CHECKING(for HPUX trusted system password database) | 46 | AC_MSG_CHECKING(for HPUX trusted system password database) |
48 | if test -f /tcb/files/auth/system/default; then | 47 | if test -f /tcb/files/auth/system/default; then |
49 | AC_MSG_RESULT(yes) | 48 | AC_MSG_RESULT(yes) |
@@ -130,7 +129,7 @@ if test -z "$no_libnsl" ; then | |||
130 | fi | 129 | fi |
131 | 130 | ||
132 | # Checks for header files. | 131 | # Checks for header files. |
133 | 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) | 132 | 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) |
134 | 133 | ||
135 | # Checks for library functions. | 134 | # Checks for library functions. |
136 | 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) | 135 | 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) |
@@ -7,11 +7,8 @@ | |||
7 | 7 | ||
8 | #include <sys/socket.h> /* For SHUT_XXXX */ | 8 | #include <sys/socket.h> /* For SHUT_XXXX */ |
9 | 9 | ||
10 | # include <netinet/in_systm.h> /* For typedefs */ | ||
10 | #include <netinet/in.h> /* For IPv6 macros */ | 11 | #include <netinet/in.h> /* For IPv6 macros */ |
11 | |||
12 | #ifdef NEED_IN_SYSTM_H | ||
13 | # include <netinet/in_systm.h> | ||
14 | #endif | ||
15 | #include <netinet/ip.h> /* For IPTOS macros */ | 12 | #include <netinet/ip.h> /* For IPTOS macros */ |
16 | 13 | ||
17 | #ifdef HAVE_SYS_BITYPES_H | 14 | #ifdef HAVE_SYS_BITYPES_H |
@@ -35,7 +35,7 @@ | |||
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.6 2000/04/29 23:30:46 damien Exp $"); | 38 | RCSID("$Id: entropy.c,v 1.7 2000/05/01 14:03:56 damien Exp $"); |
39 | 39 | ||
40 | #ifdef EGD_SOCKET | 40 | #ifdef EGD_SOCKET |
41 | #ifndef offsetof | 41 | #ifndef offsetof |
@@ -520,6 +520,8 @@ prng_write_seedfile(void) { | |||
520 | if (prng_seed_saved) | 520 | if (prng_seed_saved) |
521 | return; | 521 | return; |
522 | 522 | ||
523 | prng_seed_saved = 1; | ||
524 | |||
523 | pw = getpwuid(getuid()); | 525 | pw = getpwuid(getuid()); |
524 | if (pw == NULL) | 526 | if (pw == NULL) |
525 | fatal("Couldn't get password entry for current user (%i): %s", | 527 | fatal("Couldn't get password entry for current user (%i): %s", |
diff --git a/includes.h b/includes.h index 1a0e76f39..a83e03167 100644 --- a/includes.h +++ b/includes.h | |||
@@ -30,10 +30,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
30 | #include <sys/un.h> | 30 | #include <sys/un.h> |
31 | #include <sys/resource.h> | 31 | #include <sys/resource.h> |
32 | 32 | ||
33 | #include <netinet/in.h> | ||
34 | #include <netinet/in_systm.h> | ||
35 | #include <netinet/tcp.h> | 33 | #include <netinet/tcp.h> |
36 | #include <netinet/ip.h> | ||
37 | #include <arpa/inet.h> | 34 | #include <arpa/inet.h> |
38 | #include <netdb.h> | 35 | #include <netdb.h> |
39 | 36 | ||