diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | acconfig.h | 4 | ||||
-rw-r--r-- | configure.in | 11 | ||||
-rw-r--r-- | entropy.c | 6 | ||||
-rw-r--r-- | uidswap.c | 4 |
5 files changed, 20 insertions, 10 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20010227 | ||
2 | - (djm) | ||
3 | |||
1 | 20010226 | 4 | 20010226 |
2 | - (bal) Applied shutdown() patch for sftp.c by Corinna Vinschen | 5 | - (bal) Applied shutdown() patch for sftp.c by Corinna Vinschen |
3 | <vinschen@redhat.com> | 6 | <vinschen@redhat.com> |
@@ -4141,4 +4144,4 @@ | |||
4141 | - Wrote replacements for strlcpy and mkdtemp | 4144 | - Wrote replacements for strlcpy and mkdtemp |
4142 | - Released 1.0pre1 | 4145 | - Released 1.0pre1 |
4143 | 4146 | ||
4144 | $Id: ChangeLog,v 1.826 2001/02/26 20:38:53 mouring Exp $ | 4147 | $Id: ChangeLog,v 1.827 2001/02/26 21:39:08 djm Exp $ |
diff --git a/acconfig.h b/acconfig.h index 5617d8317..a43435868 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.104 2001/02/26 09:49:59 djm Exp $ */ | 1 | /* $Id: acconfig.h,v 1.105 2001/02/26 21:39:07 djm Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -297,7 +297,7 @@ | |||
297 | #undef NO_X11_UNIX_SOCKETS | 297 | #undef NO_X11_UNIX_SOCKETS |
298 | 298 | ||
299 | /* Needed for SCO and NeXT */ | 299 | /* Needed for SCO and NeXT */ |
300 | #undef SAVED_IDS_WORK_WITH_SETEUID | 300 | #undef BROKEN_SAVED_UIDS |
301 | 301 | ||
302 | @BOTTOM@ | 302 | @BOTTOM@ |
303 | 303 | ||
diff --git a/configure.in b/configure.in index 7f571bbdf..c79ae381e 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.254 2001/02/26 09:49:59 djm Exp $ | 1 | # $Id: configure.in,v 1.255 2001/02/26 21:39:07 djm Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -144,6 +144,9 @@ mips-sony-bsd|mips-sony-newsos4) | |||
144 | *-*-netbsd*) | 144 | *-*-netbsd*) |
145 | need_dash_r=1 | 145 | need_dash_r=1 |
146 | ;; | 146 | ;; |
147 | *-*-freebsd*) | ||
148 | check_for_libcrypt_later=1 | ||
149 | ;; | ||
147 | *-next-*) | 150 | *-next-*) |
148 | conf_lastlog_location="/usr/adm/lastlog" | 151 | conf_lastlog_location="/usr/adm/lastlog" |
149 | conf_utmp_location=/etc/utmp | 152 | conf_utmp_location=/etc/utmp |
@@ -152,7 +155,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
152 | AC_DEFINE(HAVE_NEXT) | 155 | AC_DEFINE(HAVE_NEXT) |
153 | AC_DEFINE(BROKEN_REALPATH) | 156 | AC_DEFINE(BROKEN_REALPATH) |
154 | AC_DEFINE(USE_PIPES) | 157 | AC_DEFINE(USE_PIPES) |
155 | AC_DEFINE(SAVED_IDS_WORK_WITH_SETEUID) | 158 | AC_DEFINE(BROKEN_SAVED_UIDS) |
156 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 159 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
157 | CFLAGS="$CFLAGS" | 160 | CFLAGS="$CFLAGS" |
158 | ;; | 161 | ;; |
@@ -239,7 +242,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
239 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) | 242 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) |
240 | AC_DEFINE(DISABLE_SHADOW) | 243 | AC_DEFINE(DISABLE_SHADOW) |
241 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | 244 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) |
242 | AC_DEFINE(SAVED_IDS_WORK_WITH_SETEUID) | 245 | AC_DEFINE(BROKEN_SAVED_UIDS) |
243 | AC_CHECK_FUNCS(getluid setluid) | 246 | AC_CHECK_FUNCS(getluid setluid) |
244 | ;; | 247 | ;; |
245 | *-*-sco3.2v5*) | 248 | *-*-sco3.2v5*) |
@@ -254,7 +257,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
254 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) | 257 | AC_DEFINE(HAVE_SCO_PROTECTED_PW) |
255 | AC_DEFINE(DISABLE_SHADOW) | 258 | AC_DEFINE(DISABLE_SHADOW) |
256 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) | 259 | AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) |
257 | AC_DEFINE(SAVED_IDS_WORK_WITH_SETEUID) | 260 | AC_DEFINE(BROKEN_SAVED_UIDS) |
258 | AC_CHECK_FUNCS(getluid setluid) | 261 | AC_CHECK_FUNCS(getluid setluid) |
259 | ;; | 262 | ;; |
260 | *-dec-osf*) | 263 | *-dec-osf*) |
@@ -39,7 +39,7 @@ | |||
39 | #include "pathnames.h" | 39 | #include "pathnames.h" |
40 | #include "log.h" | 40 | #include "log.h" |
41 | 41 | ||
42 | RCSID("$Id: entropy.c,v 1.30 2001/02/26 09:49:59 djm Exp $"); | 42 | RCSID("$Id: entropy.c,v 1.31 2001/02/26 21:39:07 djm Exp $"); |
43 | 43 | ||
44 | #ifndef offsetof | 44 | #ifndef offsetof |
45 | # define offsetof(type, member) ((size_t) &((type *)0)->member) | 45 | # define offsetof(type, member) ((size_t) &((type *)0)->member) |
@@ -63,6 +63,10 @@ RCSID("$Id: entropy.c,v 1.30 2001/02/26 09:49:59 djm Exp $"); | |||
63 | # define RUSAGE_CHILDREN 0 | 63 | # define RUSAGE_CHILDREN 0 |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #if defined(_POSIX_SAVED_IDS) && !defined(BROKEN_SAVED_UIDS) | ||
67 | # define SAVED_IDS_WORK_WITH_SETEUID | ||
68 | #endif | ||
69 | |||
66 | #if defined(EGD_SOCKET) || defined(RANDOM_POOL) | 70 | #if defined(EGD_SOCKET) || defined(RANDOM_POOL) |
67 | 71 | ||
68 | #ifdef EGD_SOCKET | 72 | #ifdef EGD_SOCKET |
@@ -26,13 +26,13 @@ RCSID("$OpenBSD: uidswap.c,v 1.13 2001/01/21 19:06:01 markus Exp $"); | |||
26 | * POSIX saved uids or not. | 26 | * POSIX saved uids or not. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifdef _POSIX_SAVED_IDS | 29 | #if defined(_POSIX_SAVED_IDS) && !defined(BROKEN_SAVED_UIDS) |
30 | /* Lets assume that posix saved ids also work with seteuid, even though that | 30 | /* Lets assume that posix saved ids also work with seteuid, even though that |
31 | is not part of the posix specification. */ | 31 | is not part of the posix specification. */ |
32 | #define SAVED_IDS_WORK_WITH_SETEUID | 32 | #define SAVED_IDS_WORK_WITH_SETEUID |
33 | /* Saved effective uid. */ | 33 | /* Saved effective uid. */ |
34 | static uid_t saved_euid = 0; | 34 | static uid_t saved_euid = 0; |
35 | #endif /* _POSIX_SAVED_IDS */ | 35 | #endif |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * Temporarily changes to the given uid. If the effective user | 38 | * Temporarily changes to the given uid. If the effective user |