3 files changed, 34 insertions, 0 deletions

diff --git a/configure b/configure
index 217c5a65d..76819694c 100755
--- a/configure
+++ b/configure
@@ -5562,6 +5562,31 @@ _ACEOF
 _ACEOF
 
         ;;
+*-*-k*bsd*-gnu)
+        check_for_libcrypt_later=1
+        cat >>confdefs.h <<\_ACEOF
+#define PAM_TTY_KLUDGE 1
+_ACEOF
+
+        cat >>confdefs.h <<\_ACEOF
+#define LOCKED_PASSWD_PREFIX "!"
+_ACEOF
+
+        cat >>confdefs.h <<\_ACEOF
+#define SPT_TYPE SPT_REUSEARGV
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _PATH_BTMP "/var/log/btmp"
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_BTMP 1
+_ACEOF
+
+        ;;
 *-*-linux*)
         no_dev_ptmx=1
         check_for_libcrypt_later=1
diff --git a/configure.ac b/configure.ac
index b938228c5..c94df6d6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,6 +250,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
diff --git a/debian/changelog b/debian/changelog
index 35406d56f..39199b96d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openssh (1:4.1p1-7) UNRELEASED; urgency=low
     /etc/ssh/ssh_host_key itself (closes: #312312).
   * Work around the ssh-askpass alternative somehow ending up in manual mode
     pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass.
+  * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113).
 
  -- Colin Watson <cjwatson@debian.org>  Sat,  9 Jul 2005 23:59:38 +0100