-diff -Naur openssh-3.1p1/configure.ac openssh-3.1p1-p/configure.ac
---- openssh-3.1p1/configure.ac Mon Mar 25 12:19:11 2002
-+++ openssh-3.1p1-p/configure.ac Mon Mar 25 12:19:42 2002
-@@ -121,7 +121,6 @@
+--- openssh.orig/configure.ac 2006-02-02 09:07:47.000000000 +0100
++++ openssh/configure.ac 2006-02-02 09:11:17.000000000 +0100
+@@ -313,7 +313,6 @@
no_dev_ptmx=1
check_for_libcrypt_later=1
check_for_openpty_ctty_bug=1
-- AC_DEFINE(DONT_TRY_OTHER_AF)
- AC_DEFINE(PAM_TTY_KLUDGE)
- AC_DEFINE(LOCKED_PASSWD_PREFIX, "!!")
- AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
+- AC_DEFINE(DONT_TRY_OTHER_AF, 1, [Workaround more Linux IPv6 quirks])
+ AC_DEFINE(PAM_TTY_KLUDGE, 1,
+ [Work around problematic Linux PAM modules handling of PAM_TTY])
+ AC_DEFINE(LOCKED_PASSWD_PREFIX, "!",