From 91d25a0c4537ce7f43f78498a5fc767a4d6ab0b7 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 26 Nov 2005 22:24:09 +1100
Subject: [PATCH]  - (dtucker) [configure.ac] Bug #1126: AIX 5.2 and 5.3 (and
 presumably newer,    when they're available) need the real UID set otherwise
 pam_chauthtok will    set ADMCHG after changing the password, forcing the
 user to change it    again immediately.

---
 ChangeLog    | 8 +++++++-
 configure.ac | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f65d2cfc..5fd224aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20051126
+ - (dtucker) [configure.ac] Bug #1126: AIX 5.2 and 5.3 (and presumably newer,
+   when they're available) need the real UID set otherwise pam_chauthtok will
+   set ADMCHG after changing the password, forcing the user to change it
+   again immediately.
+
 20051125
  - (dtucker) [configure.ac] Apply tim's fix for older systems where the
    resolver state in resolv.h is "state" not "__res_state".  With slight
@@ -3352,4 +3358,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4007 2005/11/25 03:44:55 dtucker Exp $
+$Id: ChangeLog,v 1.4008 2005/11/26 11:24:09 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 2149f5af6..ffa94e863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.310 2005/11/25 02:14:58 dtucker Exp $
+# $Id: configure.ac,v 1.311 2005/11/26 11:24:10 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -181,6 +181,8 @@ case "$host" in
 	AC_DEFINE(SPT_TYPE,SPT_REUSEARGV,
 		[Define to a Set Process Title type if your system is
 		supported by bsd-setproctitle.c])
+	AC_DEFINE(SSHPAM_CHAUTHTOK_NEEDS_RUID, 1,
+	    [AIX 5.2 and 5.3 (and presumably newer) require this])
 	;;
 *-*-cygwin*)
 	check_for_libcrypt_later=1