diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2018-11-22 08:48:32 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-11-22 20:58:27 +1100 |
commit | e4ae345dc75b34fd870c2e8690d831d2c1088eb7 (patch) | |
tree | 3f48b32dd7835a20f41a5b5f26ba9a05207e18e0 /regress/principals-command.sh | |
parent | f72d0f52effca5aa20a193217346615ecd3eed53 (diff) | |
download | openssh-git-e4ae345dc75b34fd870c2e8690d831d2c1088eb7.tar.gz |
upstream: Append pid to temp files in /var/run and set a cleanup
trap for them. This allows multiple instances of tests to run without
colliding.
OpenBSD-Regress-ID: 57add105ecdfc54752d8003acdd99eb68c3e0b4c
Diffstat (limited to 'regress/principals-command.sh')
-rw-r--r-- | regress/principals-command.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/regress/principals-command.sh b/regress/principals-command.sh index 66b5b5bd..197c0002 100644 --- a/regress/principals-command.sh +++ b/regress/principals-command.sh @@ -1,4 +1,4 @@ -# $OpenBSD: principals-command.sh,v 1.5 2018/10/31 11:09:27 dtucker Exp $ +# $OpenBSD: principals-command.sh,v 1.6 2018/11/22 08:48:32 dtucker Exp $ # Placed in the Public Domain. tid="authorized principals command" @@ -30,7 +30,8 @@ CA_FP=`${SSHKEYGEN} -lf $OBJ/user_ca_key.pub | awk '{ print $2 }'` # Establish a AuthorizedPrincipalsCommand in /var/run where it will have # acceptable directory permissions. -PRINCIPALS_COMMAND="/var/run/principals_command_${LOGNAME}" +PRINCIPALS_COMMAND="/var/run/principals_command_${LOGNAME}.$$" +trap "$SUDO rm -f ${PRINCIPALS_COMMAND}" 0 cat << _EOF | $SUDO sh -c "cat > '$PRINCIPALS_COMMAND'" #!/bin/sh test "x\$1" != "x${LOGNAME}" && exit 1 |