From: djm <djm>
Date: Wed, 1 Feb 2006 00:21:01 +0000 (+0000)
Subject:  - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to
X-Git-Tag: V_4_3_P1~6
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/0ceedd4e6214b62f681587263b4d12c422c543ca?ds=sidebyside

 - (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
---

diff --git a/ChangeLog b/ChangeLog
index 734384ec..d6ab16a7 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
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