diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-09 16:56:45 +0000 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-09 16:56:45 +0000 |
| commit | ca205b6dc7dea34141cb4acd129a3d272d7961c2 (patch) | |
| tree | ff040dce1d79f870f61ccf90e7a8a557a2a4f004 /regress/agent-getpeereid.sh | |
| parent | 233514106dcde5ac61a70f1043de563122e2f1c9 (diff) | |
| parent | eab087969b5a57ab226d714fb7e3a1471d6f8dac (diff) | |
| download | openssh-ca205b6dc7dea34141cb4acd129a3d272d7961c2.tar.gz | |
Merge remote-tracking branch 'origin/V_6_5' into baserock/tiagogomes/armv8l64baserock/tiagogomes/armv8l64
Conflicts:
ssh_config
sshd_config
Diffstat (limited to 'regress/agent-getpeereid.sh')
| -rw-r--r-- | regress/agent-getpeereid.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh index faf654c0..d5ae2d6e 100644 --- a/regress/agent-getpeereid.sh +++ b/regress/agent-getpeereid.sh @@ -1,4 +1,4 @@ -# $OpenBSD: agent-getpeereid.sh,v 1.4 2007/11/25 15:35:09 jmc Exp $ +# $OpenBSD: agent-getpeereid.sh,v 1.5 2013/05/17 10:33:09 dtucker Exp $ # Placed in the Public Domain. tid="disallow agent attach from other uid" @@ -18,7 +18,6 @@ if [ -z "$SUDO" ]; then exit 0 fi - trace "start agent" eval `${SSHAGENT} -s -a ${ASOCK}` > /dev/null r=$? |