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

- (djm) Fix up POSIX saved uid support. Report from Mark Miller 

<markm@swoon.net>
 - (djm) Search for -lcrypt on FreeBSD too
This commit is contained in:
Damien Miller 2001-02-27 08:39:07 +11:00
parent 0c100870ac
commit fbd884a80d
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20010227
- (djm)
20010226 20010226
- (bal) Applied shutdown() patch for sftp.c by Corinna Vinschen - (bal) Applied shutdown() patch for sftp.c by Corinna Vinschen
<vinschen@redhat.com> <vinschen@redhat.com>
@ -4141,4 +4144,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.826 2001/02/26 20:38:53 mouring Exp $ $Id: ChangeLog,v 1.827 2001/02/26 21:39:08 djm Exp $

4
acconfig.h
View File

@ -1,4 +1,4 @@
/* $Id: acconfig.h,v 1.104 2001/02/26 09:49:59 djm Exp $ */ /* $Id: acconfig.h,v 1.105 2001/02/26 21:39:07 djm Exp $ */
#ifndef _CONFIG_H #ifndef _CONFIG_H
#define _CONFIG_H #define _CONFIG_H
@ -297,7 +297,7 @@
#undef NO_X11_UNIX_SOCKETS #undef NO_X11_UNIX_SOCKETS
/* Needed for SCO and NeXT */ /* Needed for SCO and NeXT */
#undef SAVED_IDS_WORK_WITH_SETEUID #undef BROKEN_SAVED_UIDS
@BOTTOM@ @BOTTOM@

11
configure.in
View File

@ -1,4 +1,4 @@
# $Id: configure.in,v 1.254 2001/02/26 09:49:59 djm Exp $ # $Id: configure.in,v 1.255 2001/02/26 21:39:07 djm Exp $
AC_INIT(ssh.c) AC_INIT(ssh.c)
@ -144,6 +144,9 @@ mips-sony-bsd|mips-sony-newsos4)
*-*-netbsd*) *-*-netbsd*)
need_dash_r=1 need_dash_r=1
;; ;;
*-*-freebsd*)
check_for_libcrypt_later=1
;;
*-next-*) *-next-*)
conf_lastlog_location="/usr/adm/lastlog" conf_lastlog_location="/usr/adm/lastlog"
conf_utmp_location=/etc/utmp conf_utmp_location=/etc/utmp
@ -152,7 +155,7 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(HAVE_NEXT) AC_DEFINE(HAVE_NEXT)
AC_DEFINE(BROKEN_REALPATH) AC_DEFINE(BROKEN_REALPATH)
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(SAVED_IDS_WORK_WITH_SETEUID) AC_DEFINE(BROKEN_SAVED_UIDS)
CPPFLAGS="$CPPFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
CFLAGS="$CFLAGS" CFLAGS="$CFLAGS"
;; ;;
@ -239,7 +242,7 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(HAVE_SCO_PROTECTED_PW) AC_DEFINE(HAVE_SCO_PROTECTED_PW)
AC_DEFINE(DISABLE_SHADOW) AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
AC_DEFINE(SAVED_IDS_WORK_WITH_SETEUID) AC_DEFINE(BROKEN_SAVED_UIDS)
AC_CHECK_FUNCS(getluid setluid) AC_CHECK_FUNCS(getluid setluid)
;; ;;
*-*-sco3.2v5*) *-*-sco3.2v5*)
@ -254,7 +257,7 @@ mips-sony-bsd|mips-sony-newsos4)
AC_DEFINE(HAVE_SCO_PROTECTED_PW) AC_DEFINE(HAVE_SCO_PROTECTED_PW)
AC_DEFINE(DISABLE_SHADOW) AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H) AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
AC_DEFINE(SAVED_IDS_WORK_WITH_SETEUID) AC_DEFINE(BROKEN_SAVED_UIDS)
AC_CHECK_FUNCS(getluid setluid) AC_CHECK_FUNCS(getluid setluid)
;; ;;
*-dec-osf*) *-dec-osf*)

6
entropy.c
View File

@ -39,7 +39,7 @@
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
RCSID("$Id: entropy.c,v 1.30 2001/02/26 09:49:59 djm Exp $"); RCSID("$Id: entropy.c,v 1.31 2001/02/26 21:39:07 djm Exp $");
#ifndef offsetof #ifndef offsetof
# define offsetof(type, member) ((size_t) &((type *)0)->member) # 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 $");
# define RUSAGE_CHILDREN 0 # define RUSAGE_CHILDREN 0
#endif #endif
#if defined(_POSIX_SAVED_IDS) && !defined(BROKEN_SAVED_UIDS)
# define SAVED_IDS_WORK_WITH_SETEUID
#endif
#if defined(EGD_SOCKET) || defined(RANDOM_POOL) #if defined(EGD_SOCKET) || defined(RANDOM_POOL)
#ifdef EGD_SOCKET #ifdef EGD_SOCKET

4
uidswap.c
View File

@ -26,13 +26,13 @@ RCSID("$OpenBSD: uidswap.c,v 1.13 2001/01/21 19:06:01 markus Exp $");
* POSIX saved uids or not. * POSIX saved uids or not.
*/ */
#ifdef _POSIX_SAVED_IDS #if defined(_POSIX_SAVED_IDS) && !defined(BROKEN_SAVED_UIDS)
/* Lets assume that posix saved ids also work with seteuid, even though that /* Lets assume that posix saved ids also work with seteuid, even though that
is not part of the posix specification. */ is not part of the posix specification. */
#define SAVED_IDS_WORK_WITH_SETEUID #define SAVED_IDS_WORK_WITH_SETEUID
/* Saved effective uid. */ /* Saved effective uid. */
static uid_t saved_euid = 0; static uid_t saved_euid = 0;
#endif /* _POSIX_SAVED_IDS */ #endif
/* /*
* Temporarily changes to the given uid. If the effective user * Temporarily changes to the given uid. If the effective user