From e4d4ddbbba0e585ca3ec3a455430750b4622a6d3 Mon Sep 17 00:00:00 2001 From: "millert@openbsd.org@openbsd.org" Date: Wed, 25 Oct 2017 20:08:36 +0000 Subject: upstream commit Use printenv to test whether an SSH_USER_AUTH is set instead of using $SSH_USER_AUTH. The latter won't work with csh which treats unknown variables as an error when expanding them. OK markus@ OpenBSD-Regress-ID: f601e878dd8b71aa40381573dde3a8f567e6f2d1 --- regress/authinfo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regress/authinfo.sh b/regress/authinfo.sh index e725296c9..9bd0a4d83 100644 --- a/regress/authinfo.sh +++ b/regress/authinfo.sh @@ -1,4 +1,4 @@ -# $OpenBSD: authinfo.sh,v 1.1 2017/06/24 06:35:24 djm Exp $ +# $OpenBSD: authinfo.sh,v 1.2 2017/10/25 20:08:36 millert Exp $ # Placed in the Public Domain. tid="authinfo" @@ -6,7 +6,7 @@ tid="authinfo" # Ensure the environment variable doesn't leak when ExposeAuthInfo=no. verbose "ExposeAuthInfo=no" env SSH_USER_AUTH=blah ${SSH} -F $OBJ/ssh_proxy x \ - 'test -z "$SSH_USER_AUTH"' || fail "SSH_USER_AUTH present" + 'printenv SSH_USER_AUTH >/dev/null' && fail "SSH_USER_AUTH present" verbose "ExposeAuthInfo=yes" echo ExposeAuthInfo=yes >> $OBJ/sshd_proxy -- cgit v1.2.3