diff --git a/trunk/configure.in b/trunk/configure.in
index e013f87..01dfd21 100644
--- a/trunk/configure.in
+++ b/trunk/configure.in
@@ -155,11 +155,19 @@ int main(void) { exit(0); }
 		AC_MSG_RESULT($blibflags)
 	fi
 	LDFLAGS="$saved_LDFLAGS"
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-*-cygwin*)
 	AC_DEFINE(HAVE_CYGWIN, 1, [Define if you are on Cygwin])
 	;;
 *-*-dgux*)
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-*-darwin*)
 	AC_MSG_CHECKING(if we have working getaddrinfo)
@@ -172,6 +180,10 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 	[AC_MSG_RESULT(buggy)
 	AC_DEFINE(BROKEN_GETADDRINFO, 1, [getaddrinfo is broken (if present)])],
 	[AC_MSG_RESULT(assume it is working)])
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-*-dragonfly*)
 	;;
@@ -204,10 +216,18 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 	AC_DEFINE(BROKEN_INET_NTOA, 1,
 		[Define if you system's inet_ntoa is busted
 		(e.g. Irix gcc issue)])
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-*-irix6*)
 	PATH="$PATH:/usr/etc"
 	AC_DEFINE(BROKEN_INET_NTOA)
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-*-linux*)
 	AC_DEFINE(DONT_TRY_OTHER_AF, 1, [Workaround more Linux IPv6 quirks])
@@ -221,6 +241,10 @@ mips-sony-bsd|mips-sony-newsos4)
 *-*-freebsd*)
 	;;
 *-*-bsdi*)
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-next-*)
 	;;
@@ -235,6 +259,10 @@ mips-sony-bsd|mips-sony-newsos4)
 	;;
 *-ncr-sysv*)
 	LIBS="$LIBS -lc89"
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-sni-sysv*)
 	# /usr/ucblib MUST NOT be searched on ReliantUNIX
@@ -244,12 +272,24 @@ mips-sony-bsd|mips-sony-newsos4)
 	# /usr/ucblib/libucb.a no longer needed on ReliantUNIX
 	# Attention: always take care to bind libsocket and libnsl before libc,
 	# otherwise you will find lots of "SIOCGPGRP errno 22" on syslog
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 # UnixWare 1.x, UnixWare 2.x, and others based on code from Univel.
 *-*-sysv4.2*)
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-*-sysv*)
 	;;
@@ -266,11 +306,19 @@ mips-sony-bsd|mips-sony-newsos4)
 	no_dev_ptmx=1
 	MANTYPE=man
 	TEST_SHELL=ksh
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-*-unicosmk*)
 	LDFLAGS="$LDFLAGS"
 	LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm"
 	MANTYPE=cat
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-*-unicosmp*)
 	LDFLAGS="$LDFLAGS"
@@ -281,9 +329,17 @@ mips-sony-bsd|mips-sony-newsos4)
 	LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal"
 	LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm"
 	MANTYPE=cat
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-dec-osf*)
 	AC_DEFINE(BROKEN_GETADDRINFO)
+	AC_DEFINE(SETEUID_BREAKS_SETUID, 1,
+	    [Define if your platform breaks doing a seteuid before a setuid])
+	AC_DEFINE(BROKEN_SETREUID, 1, [Define if your setreuid() is broken])
+	AC_DEFINE(BROKEN_SETREGID, 1, [Define if your setregid() is broken])
 	;;
 *-*-nto-qnx*)
 	;;
@@ -351,6 +407,7 @@ AC_CHECK_FUNCS([ \
 	memset \
 	mkdir \
 	select \
+	seteuid \
 	setlocale \
 	setproctitle \
 	setsid \
diff --git a/trunk/src/sj3proxy/priv.c b/trunk/src/sj3proxy/priv.c
index 96383f4..9cb1394 100644
--- a/trunk/src/sj3proxy/priv.c
+++ b/trunk/src/sj3proxy/priv.c
@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -52,8 +53,21 @@ set_priv(const char *title)
 	 * Drop privileges and clear the group access list
 	 */
 	if (setgroups(1, &pw->pw_gid) == -1 ||
+#if defined(HAVE_SETRESUID) && !defined(BROKEN_SETRESUID)
 	    setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1 ||
-	    setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1) {
+	    setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1
+#elif defined(HAVE_SETREUID) && !defined(BROKEN_SETREUID)
+	    setregid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1 ||
+	    setreuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1
+#else
+# ifndef SETEUID_BREAKS_SETUID
+	    setegid(pw->pw_gid) == -1 ||
+	    seteuid(pw->pw_uid) == -1
+# endif
+	    setgid(pw->pw_gid) == -1 ||
+	    setuid(pw->pw_uid) == -1
+#endif
+	   ) {
 		fprintf(stderr, "can't drop privileges\n");
 		fflush(stderr);
 		exit(255);
diff --git a/trunk/src/sj3serv/priv.c b/trunk/src/sj3serv/priv.c
index 7d8b810..d4c39df 100644
--- a/trunk/src/sj3serv/priv.c
+++ b/trunk/src/sj3serv/priv.c
@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -53,8 +54,21 @@ set_priv(const char *title)
 	 * Drop privileges and clear the group access list
 	 */
 	if (setgroups(1, &pw->pw_gid) == -1 ||
+#if defined(HAVE_SETRESUID) && !defined(BROKEN_SETRESUID)
 	    setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1 ||
-	    setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1) {
+	    setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1
+#elif defined(HAVE_SETREUID) && !defined(BROKEN_SETREUID)
+	    setregid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1 ||
+	    setreuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1
+#else
+# ifndef SETEUID_BREAKS_SETUID
+	    setegid(pw->pw_gid) == -1 ||
+	    seteuid(pw->pw_uid) == -1
+# endif
+	    setgid(pw->pw_gid) == -1 ||
+	    setuid(pw->pw_uid) == -1
+#endif
+	   ) {
 		fprintf(stderr, "can't drop privileges\n");
 		fflush(stderr);
 		exit(255);