From e682cb07803f71ec01e15394ac8445431cfda176 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 1 Feb 2006 11:21:01 +1100
Subject:  - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to 
   determine the user's login name - needed for regress tests on Solaris    10
 and OpenSolaris

---
 ChangeLog            | 7 ++++++-
 regress/test-exec.sh | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8d7e1ccc..dfd6db80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20060201
+ - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to 
+   determine the user's login name - needed for regress tests on Solaris 
+   10 and OpenSolaris
+
 20060131
  - (djm) OpenBSD CVS Sync
    - jmc@cvs.openbsd.org 2006/01/20 11:21:45
@@ -3798,4 +3803,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.4112 2006/01/31 11:11:37 djm Exp $
+$Id: ChangeLog,v 1.4113 2006/02/01 00:21:01 djm Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index bfbb305b..59ae33c0 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -24,6 +24,8 @@ if [ -x /usr/ucb/whoami ]; then
 	USER=`/usr/ucb/whoami`
 elif whoami >/dev/null 2>&1; then
 	USER=`whoami`
+elif logname >/dev/null 2>&1; then
+	USER=`logname`
 else
 	USER=`id -un`
 fi
-- 
cgit v1.2.3