- (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/strtoul.c]

[openssh.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 84cc78ce04faa8a0b40d39e309fd24ce65c978f4..8c2bb0512604cf972de35dfc5a7352ccb269fe08 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -146,7 +146,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(LOGIN_NO_ENDOPT)
        AC_DEFINE(LOGIN_NEEDS_UTMPX)
-       AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(DISABLE_UTMP)
        AC_DEFINE(LOCKED_PASSWD_STRING, "*")
        AC_DEFINE(SPT_TYPE,SPT_PSTAT)
@@ -163,7 +162,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(LOGIN_NO_ENDOPT)
        AC_DEFINE(LOGIN_NEEDS_UTMPX)
-       AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(DISABLE_UTMP)
        AC_DEFINE(LOCKED_PASSWD_STRING, "*")
        AC_DEFINE(SPT_TYPE,SPT_PSTAT)
@@ -177,7 +175,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(LOGIN_NO_ENDOPT)
        AC_DEFINE(LOGIN_NEEDS_UTMPX)
-       AC_DEFINE(DISABLE_SHADOW)
        AC_DEFINE(DISABLE_UTMP)
        AC_DEFINE(LOCKED_PASSWD_STRING, "*")
        AC_DEFINE(SPT_TYPE,SPT_PSTAT)
@@ -189,6 +186,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        LDFLAGS="$LDFLAGS"
        PATH="$PATH:/usr/etc"
        AC_DEFINE(BROKEN_INET_NTOA)
+       AC_DEFINE(SETEUID_BREAKS_SETUID)
+       AC_DEFINE(BROKEN_SETREUID)
+       AC_DEFINE(BROKEN_SETREGID)
        AC_DEFINE(WITH_ABBREV_NO_TTY)
        AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
        ;;
@@ -739,7 +739,7 @@ AC_CHECK_FUNCS(\
        setdtablesize setegid setenv seteuid setgroups setlogin setpcred \
        setproctitle setregid setresgid setresuid setreuid setrlimit \
        setsid setvbuf sigaction sigvec snprintf socketpair strerror \
-       strlcat strlcpy strmode strnvis sysconf tcgetpgrp \
+       strlcat strlcpy strmode strnvis strtoul sysconf tcgetpgrp \
        truncate utimes vhangup vsnprintf waitpid \
 )
 
@@ -897,7 +897,6 @@ AC_ARG_WITH(pam,
                        AC_CHECK_FUNCS(pam_getenvlist)
                        AC_CHECK_FUNCS(pam_putenv)
 
-                       disable_shadow=yes
                        PAM_MSG="yes"
 
                        AC_DEFINE(USE_PAM)