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

   <markm@swoon.net>
 - (djm) Search for -lcrypt on FreeBSD too

diff --git a/ChangeLog b/ChangeLog
index ae6fa40f78a89973f7bee8595376da22d8231390..ac80f30313f0e81a656cff35adfdb259fa4704cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20010227
+ - (djm) 
+
 20010226
  - (bal) Applied shutdown() patch for sftp.c by  Corinna Vinschen 
    <vinschen@redhat.com>

diff --git a/acconfig.h b/acconfig.h
index 0f1fc41bf70f000464c30676aebd9d59c816b6c7..7a817fa73331f7fb68a34763865e5971c9bb5e16 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -297,7 +297,7 @@
 #undef NO_X11_UNIX_SOCKETS
 
 /* Needed for SCO and NeXT */
-#undef SAVED_IDS_WORK_WITH_SETEUID
+#undef BROKEN_SAVED_UIDS
 
 @BOTTOM@
 

diff --git a/configure.in b/configure.in
index 7857d293094d051af45a630cf49e95061713dce3..0a1e41d284f4cba2c3d48bf1bdf309d481ffbf54 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -144,6 +144,9 @@ mips-sony-bsd|mips-sony-newsos4)
 *-*-netbsd*)
        need_dash_r=1
        ;;
+*-*-freebsd*)
+       check_for_libcrypt_later=1
+       ;;
 *-next-*)
        conf_lastlog_location="/usr/adm/lastlog"
        conf_utmp_location=/etc/utmp
@@ -152,7 +155,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(HAVE_NEXT)
        AC_DEFINE(BROKEN_REALPATH)
        AC_DEFINE(USE_PIPES)
-       AC_DEFINE(SAVED_IDS_WORK_WITH_SETEUID)
+       AC_DEFINE(BROKEN_SAVED_UIDS)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        CFLAGS="$CFLAGS"
        ;;
@@ -239,7 +242,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(HAVE_SCO_PROTECTED_PW)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
-       AC_DEFINE(SAVED_IDS_WORK_WITH_SETEUID)
+       AC_DEFINE(BROKEN_SAVED_UIDS)
        AC_CHECK_FUNCS(getluid setluid)
        ;;
 *-*-sco3.2v5*)
@@ -254,7 +257,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(HAVE_SCO_PROTECTED_PW)
        AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(HAVE_BOGUS_SYS_QUEUE_H)
-       AC_DEFINE(SAVED_IDS_WORK_WITH_SETEUID)
+       AC_DEFINE(BROKEN_SAVED_UIDS)
        AC_CHECK_FUNCS(getluid setluid)
        ;;
 *-dec-osf*)

diff --git a/entropy.c b/entropy.c
index 0d8d15a6231bbcb518fbed8a0b885111fe750d23..260d5bdff2faa465f8acf7932baae273db76879c 100644 (file)
--- a/entropy.c
+++ b/entropy.c
@@ -63,6 +63,10 @@ RCSID("$Id$");
 # define RUSAGE_CHILDREN 0
 #endif
 
+#if defined(_POSIX_SAVED_IDS) && !defined(BROKEN_SAVED_UIDS)
+# define SAVED_IDS_WORK_WITH_SETEUID
+#endif
+
 #if defined(EGD_SOCKET) || defined(RANDOM_POOL)
 
 #ifdef EGD_SOCKET

diff --git a/uidswap.c b/uidswap.c
index 8b7f535bec978ede341a97ddac512d56e064e819..bdfa484fc2ef75caf358a23ea278ad32d3cabaf8 100644 (file)
--- a/uidswap.c
+++ b/uidswap.c
@@ -26,13 +26,13 @@ RCSID("$OpenBSD: uidswap.c,v 1.13 2001/01/21 19:06:01 markus Exp $");
  * 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
    is not part of the posix specification. */
 #define SAVED_IDS_WORK_WITH_SETEUID
 /* Saved effective uid. */
 static uid_t saved_euid = 0;
-#endif /* _POSIX_SAVED_IDS */
+#endif
 
 /*
  * Temporarily changes to the given uid.  If the effective user