From 0249f93c4d9c552cdcaf2dec7af1f2fc20fdcbaa Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 24 Jun 2006 12:10:07 +1000
Subject: [PATCH]  - (dtucker) [configure.ac] Bug #1193: Define
 PASSWD_NEEDS_USERNAME on Solaris.    Works around limitation in Solaris'
 passwd program for changing passwords    where the username is longer than 8
 characters.  ok djm@

---
 ChangeLog    | 7 ++++++-
 configure.ac | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dfaa46795..b5635b423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20060624
+ - (dtucker) [configure.ac] Bug #1193: Define PASSWD_NEEDS_USERNAME on Solaris.
+   Works around limitation in Solaris' passwd program for changing passwords
+   where the username is longer than 8 characters.  ok djm@
+
 20060623
  - (dtucker) [README.platform configure.ac openbsd-compat/port-tun.c] Add
    tunnel support for Mac OS X/Darwin via a third-party tun driver.  Patch
@@ -4697,4 +4702,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.4346 2006/06/23 11:24:12 dtucker Exp $
+$Id: ChangeLog,v 1.4347 2006/06/24 02:10:07 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 259b5c288..f6cd7bb95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.341 2006/06/23 11:24:13 dtucker Exp $
+# $Id: configure.ac,v 1.342 2006/06/24 02:10:07 dtucker 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.341 $)
+AC_REVISION($Revision: 1.342 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -410,6 +410,8 @@ mips-sony-bsd|mips-sony-newsos4)
 	AC_DEFINE(SSHD_ACQUIRES_CTTY, 1,
 		[Define if sshd somehow reacquires a controlling TTY
 		after setsid()])
+	AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd
+		in case the name is longer than 8 chars])
 	external_path_file=/etc/default/login
 	# hardwire lastlog location (can't detect it on some versions)
 	conf_lastlog_location="/var/adm/lastlog"