[configure.ac] Prefer setuid/setgid on UnixWare and Open Server.

2 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5215799fa..39303b67f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
    Based partially on patch supplied by alex.kiernan at thus.net.  ok djm@
  - (tim) [configure.ac] Move libgen tests to before libwrap to unbreak
    UnixWare 2.03 using --with-tcp-wrappers.
+ - (tim) [configure.ac] Prefer setuid/setgid on UnixWare and Open Server.
 
 20030910
  - (dtucker) [configure.ac] Bug #636: Add support for Cray's new X1 machine.
@@ -1066,4 +1067,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2980 2003/09/12 05:19:31 tim Exp $
+$Id: ChangeLog,v 1.2981 2003/09/12 05:24:36 tim Exp $
diff --git a/configure.ac b/configure.ac
index ad0eedc68..a0bd057ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.151 2003/09/12 05:19:31 tim Exp $
+# $Id: configure.ac,v 1.152 2003/09/12 05:24:36 tim Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -294,11 +294,17 @@ mips-sony-bsd|mips-sony-newsos4)
         CPPFLAGS="$CPPFLAGS -I/usr/local/include"
         LDFLAGS="$LDFLAGS -L/usr/local/lib"
         AC_DEFINE(USE_PIPES)
+        AC_DEFINE(SETEUID_BREAKS_SETUID)
+        AC_DEFINE(BROKEN_SETREUID)
+        AC_DEFINE(BROKEN_SETREGID)
         ;;
 *-*-sysv5*)
         CPPFLAGS="$CPPFLAGS -I/usr/local/include"
         LDFLAGS="$LDFLAGS -L/usr/local/lib"
         AC_DEFINE(USE_PIPES)
+        AC_DEFINE(SETEUID_BREAKS_SETUID)
+        AC_DEFINE(BROKEN_SETREUID)
+        AC_DEFINE(BROKEN_SETREGID)
         ;;
 *-*-sysv*)
         CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -331,6 +337,9 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(HAVE_SECUREWARE)
         AC_DEFINE(DISABLE_SHADOW)
         AC_DEFINE(DISABLE_FD_PASSING)
+        AC_DEFINE(SETEUID_BREAKS_SETUID)
+        AC_DEFINE(BROKEN_SETREUID)
+        AC_DEFINE(BROKEN_SETREGID)
         AC_CHECK_FUNCS(getluid setluid)
         MANTYPE=man
         ;;