1 files changed, 39 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index fcf7e416b..991e0fef3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,6 +478,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
             AC_DEFINE(AU_IPv4, 0, [System only supports IPv4 audit records])
             [#include <bsm/audit.h>]
         )
+        AC_MSG_CHECKING(if we have the Security Authorization Session API)
+        AC_TRY_COMPILE([#include <Security/AuthSession.h>],
+                [SessionCreate(0, 0);],
+                [ac_cv_use_security_session_api="yes"
+                 AC_DEFINE(USE_SECURITY_SESSION_API, 1, 
+                        [platform has the Security Authorization Session API])
+                 LIBS="$LIBS -framework Security"
+                 AC_MSG_RESULT(yes)],
+                [ac_cv_use_security_session_api="no"
+                 AC_MSG_RESULT(no)])
+        AC_MSG_CHECKING(if we have an in-memory credentials cache)
+        AC_TRY_COMPILE(
+                [#include <Kerberos/Kerberos.h>],
+                [cc_context_t c;
+                 (void) cc_initialize (&c, 0, NULL, NULL);],
+                [AC_DEFINE(USE_CCAPI, 1, 
+                        [platform uses an in-memory credentials cache])
+                 LIBS="$LIBS -framework Security"
+                 AC_MSG_RESULT(yes)
+                 if test "x$ac_cv_use_security_session_api" = "xno"; then
+                        AC_MSG_ERROR(*** Need a security framework to use the credentials cache API ***)
+                fi],
+                [AC_MSG_RESULT(no)]
+        )
         ;;
 *-*-dragonfly*)
         SSHDLIBS="$SSHDLIBS -lcrypt"
@@ -561,6 +585,14 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
         AC_DEFINE(WITH_ABBREV_NO_TTY)
         AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
         ;;
+*-*-k*bsd*-gnu)
+        check_for_libcrypt_later=1
+        AC_DEFINE(PAM_TTY_KLUDGE)
+        AC_DEFINE(LOCKED_PASSWD_PREFIX, "!")
+        AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
+        AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts])
+        AC_DEFINE(USE_BTMP, 1, [Use btmp to log bad logins])
+        ;;
 *-*-linux*)
         no_dev_ptmx=1
         check_for_libcrypt_later=1
@@ -592,6 +624,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
                 AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
                     [Prepend the address family to IP tunnel traffic])
         fi
+        AC_DEFINE(OOM_ADJUST, 1, [Adjust Linux out-of-memory killer])
         ;;
 mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(NEED_SETPGRP, 1, [Need setpgrp to acquire controlling tty])
@@ -3305,9 +3338,12 @@ AC_ARG_WITH(selinux,
                 AC_DEFINE(WITH_SELINUX,1,[Define if you want SELinux support.])
                 SELINUX_MSG="yes"
                 AC_CHECK_HEADER([selinux/selinux.h], ,
-                    AC_MSG_ERROR(SELinux support requires selinux.h header))
-                AC_CHECK_LIB(selinux, setexeccon, [ LIBSELINUX="-lselinux" ],
-                    AC_MSG_ERROR(SELinux support requires libselinux library))
+                        AC_MSG_ERROR(SELinux support requires selinux.h header))
+                AC_CHECK_LIB(selinux, setexeccon,
+                        [ LIBSELINUX="-lselinux"
+                          LIBS="$LIBS -lselinux"
+                        ],
+                        AC_MSG_ERROR(SELinux support requires libselinux library))
                 SSHDLIBS="$SSHDLIBS $LIBSELINUX"
                 AC_CHECK_FUNCS(getseuserbyname get_default_context_with_level)
                 LIBS="$save_LIBS"