2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 23c67df9f..b0e4c46fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,8 @@
      [sftp-client.c]
      use off_t instead of u_int64_t for file offsets, matching what the
      progressmeter code expects; bz #842
+ - (tim) [defines.h] Fix regression in long password support on OpenServer 6.
+   Problem report and additional testing rac AT tenzing.org.
 
 20070914
  - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path.
@@ -3256,4 +3258,4 @@
    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.4756 2007/09/17 06:12:03 djm Exp $
+$Id: ChangeLog,v 1.4757 2007/09/17 15:32:32 tim Exp $
diff --git a/defines.h b/defines.h
index 5e7d6769d..237795339 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.143 2007/08/09 04:37:52 dtucker Exp $ */
+/* $Id: defines.h,v 1.144 2007/09/17 15:32:33 tim Exp $ */
 
 
 /* Constants */
@@ -694,9 +694,11 @@ struct winsize {
 # define CUSTOM_SYS_AUTH_PASSWD 1
 #endif
 
+#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID)
+# define CUSTOM_SYS_AUTH_PASSWD 1
+#endif
 #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF)
 # define USE_LIBIAF
-# define CUSTOM_SYS_AUTH_PASSWD 1
 #endif
 
 /* HP-UX 11.11 */