diff options
author | Damien Miller <djm@mindrot.org> | 2006-02-01 11:21:01 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-02-01 11:21:01 +1100 |
commit | e682cb07803f71ec01e15394ac8445431cfda176 (patch) | |
tree | 1b90b79df5f103a0f8ce1e460b5a1694e0f4ea74 | |
parent | 923f1ce0b779e59bb7c0cf46351b8a262964e7f3 (diff) |
- (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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | regress/test-exec.sh | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20060201 | ||
2 | - (djm) [regress/test-exec.sh] Try 'logname' as well as 'whoami' to | ||
3 | determine the user's login name - needed for regress tests on Solaris | ||
4 | 10 and OpenSolaris | ||
5 | |||
1 | 20060131 | 6 | 20060131 |
2 | - (djm) OpenBSD CVS Sync | 7 | - (djm) OpenBSD CVS Sync |
3 | - jmc@cvs.openbsd.org 2006/01/20 11:21:45 | 8 | - jmc@cvs.openbsd.org 2006/01/20 11:21:45 |
@@ -3798,4 +3803,4 @@ | |||
3798 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3803 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3799 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3804 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3800 | 3805 | ||
3801 | $Id: ChangeLog,v 1.4112 2006/01/31 11:11:37 djm Exp $ | 3806 | $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 bfbb305b4..59ae33c08 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -24,6 +24,8 @@ if [ -x /usr/ucb/whoami ]; then | |||
24 | USER=`/usr/ucb/whoami` | 24 | USER=`/usr/ucb/whoami` |
25 | elif whoami >/dev/null 2>&1; then | 25 | elif whoami >/dev/null 2>&1; then |
26 | USER=`whoami` | 26 | USER=`whoami` |
27 | elif logname >/dev/null 2>&1; then | ||
28 | USER=`logname` | ||
27 | else | 29 | else |
28 | USER=`id -un` | 30 | USER=`id -un` |
29 | fi | 31 | fi |