2 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2fff9e388..da9e201b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled
    interop tests from FATAL error to a warning. Allows some interop
    tests to proceed if others are missing necessary prerequisites.
+ - (djm) [configure.ac] support GNU/kFreeBSD and GNU/kOpensolaris
+   systems; patch from Aurelien Jarno via rmh AT aybabtu.com
 
 20090214
  - (djm) OpenBSD CVS Sync
@@ -5169,5 +5171,5 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5196 2009/02/16 04:21:39 djm Exp $
+$Id: ChangeLog,v 1.5197 2009/02/16 04:37:03 djm Exp $
 
diff --git a/configure.ac b/configure.ac
index 242dea0dc..b33914dae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.414 2009/02/12 02:12:22 djm Exp $
+# $Id: configure.ac,v 1.415 2009/02/16 04:37:03 djm Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.414 $)
+AC_REVISION($Revision: 1.415 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -563,6 +563,14 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
         AC_DEFINE(WITH_ABBREV_NO_TTY)
         AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
         ;;
+*-*-k*bsd*-gnu | *-*-kopensolaris*-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