diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2022-12-01 02:19:29 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2022-12-02 11:51:02 +1100 |
commit | 7a8b40cf6a5eda80173140cc6750a6db8412fa87 (patch) | |
tree | 56dafa8ba04abf0eb932a38e9d8be3f2508f1c5a /regress/agent-getpeereid.sh | |
parent | 4a1805d532616233dd6072e5cd273b96dd3062e6 (diff) | |
download | openssh-git-7a8b40cf6a5eda80173140cc6750a6db8412fa87.tar.gz |
upstream: Log output of ssh-agent and ssh-add
This should make debugging easier.
OpenBSD-Regress-ID: 5974b02651f428d7e1079b41304c498ca7e306c8
Diffstat (limited to 'regress/agent-getpeereid.sh')
-rw-r--r-- | regress/agent-getpeereid.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh index b84471a7..79e9c7d9 100644 --- a/regress/agent-getpeereid.sh +++ b/regress/agent-getpeereid.sh @@ -6,6 +6,8 @@ tid="disallow agent attach from other uid" UNPRIV=nobody ASOCK=${OBJ}/agent SSH_AUTH_SOCK=/nonexistent +>$OBJ/ssh-agent.log +>$OBJ/ssh-add.log if config_defined HAVE_GETPEEREID HAVE_GETPEERUCRED HAVE_SO_PEERCRED ; then : @@ -25,14 +27,14 @@ case "x$SUDO" in esac trace "start agent" -eval `${SSHAGENT} ${EXTRA_AGENT_ARGS} -s -a ${ASOCK}` > /dev/null +eval `${SSHAGENT} ${EXTRA_AGENT_ARGS} -s -a ${ASOCK}` >$OBJ/ssh-agent.log 2>&1 r=$? if [ $r -ne 0 ]; then fail "could not start ssh-agent: exit code $r" else chmod 644 ${SSH_AUTH_SOCK} - ${SSHADD} -l > /dev/null 2>&1 + ${SSHADD} -vvv -l >>$OBJ/ssh-add.log 2>&1 r=$? if [ $r -ne 1 ]; then fail "ssh-add failed with $r != 1" @@ -42,15 +44,16 @@ else ${SUDO} -n -u ${UNPRIV} ${SSHADD} -l 2>/dev/null else # sudo - < /dev/null ${SUDO} -S -u ${UNPRIV} ${SSHADD} -l 2>/dev/null + < /dev/null ${SUDO} -S -u ${UNPRIV} ${SSHADD} -vvv -l >>$OBJ/ssh-add.log 2>&1 fi r=$? if [ $r -lt 2 ]; then fail "ssh-add did not fail for ${UNPRIV}: $r < 2" + cat $OBJ/ssh-add.log fi trace "kill agent" - ${SSHAGENT} -k > /dev/null + ${SSHAGENT} -vvv -k >>$OBJ/ssh-agent.log 2>&1 fi rm -f ${OBJ}/agent |