tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unbreak principals-command test 

Undo inconsistetly updated variable name.
This commit is contained in:
Damien Miller 2016-10-13 18:53:43 +11:00
parent 1723ec92eb
commit ca04de83f2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
regress/principals-command.sh
View File

@ -30,8 +30,8 @@ CA_FP=`${SSHKEYGEN} -lf $OBJ/user_ca_key.pub | awk '{ print $2 }'`
# Establish a AuthorizedPrincipalsCommand in /var/run where it will have # Establish a AuthorizedPrincipalsCommand in /var/run where it will have
# acceptable directory permissions. # acceptable directory permissions.
PRINCIPALS_CMD="/var/run/principals_command_${LOGNAME}" PRINCIPALS_COMMAND="/var/run/principals_command_${LOGNAME}"
cat << _EOF | $SUDO sh -c "cat > '$PRINCIPALS_CMD'" cat << _EOF | $SUDO sh -c "cat > '$PRINCIPALS_COMMAND'"
#!/bin/sh #!/bin/sh
test "x\$1" != "x${LOGNAME}" && exit 1 test "x\$1" != "x${LOGNAME}" && exit 1
test "x\$2" != "xssh-rsa-cert-v01@openssh.com" && exit 1 test "x\$2" != "xssh-rsa-cert-v01@openssh.com" && exit 1
@ -46,16 +46,16 @@ test -f "$OBJ/authorized_principals_${LOGNAME}" &&
exec cat "$OBJ/authorized_principals_${LOGNAME}" exec cat "$OBJ/authorized_principals_${LOGNAME}"
_EOF _EOF
test $? -eq 0 || fatal "couldn't prepare principals command" test $? -eq 0 || fatal "couldn't prepare principals command"
$SUDO chmod 0755 "$PRINCIPALS_CMD" $SUDO chmod 0755 "$PRINCIPALS_COMMAND"
if ! $OBJ/check-perm -m keys-command $PRINCIPALS_CMD ; then if ! $OBJ/check-perm -m keys-command $PRINCIPALS_COMMAND ; then
echo "skipping: $PRINCIPALS_CMD is unsuitable as " \ echo "skipping: $PRINCIPALS_COMMAND is unsuitable as " \
"AuthorizedPrincipalsCommand" "AuthorizedPrincipalsCommand"
$SUDO rm -f $PRINCIPALS_CMD $SUDO rm -f $PRINCIPALS_COMMAND
exit 0 exit 0
fi fi
if [ -x $PRINCIPALS_CMD ]; then if [ -x $PRINCIPALS_COMMAND ]; then
# Test explicitly-specified principals # Test explicitly-specified principals
for privsep in yes no ; do for privsep in yes no ; do
_prefix="privsep $privsep" _prefix="privsep $privsep"