sshtunnel: allow empty port and user

A user may have some host configured in the .ssh/config with user and port.
But we anyway have to specify them in the sshtunnel.
The change fixes this

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
This commit is contained in:
Sergey Ponomarev 2023-06-21 20:01:31 +03:00 committed by Nuno Goncalves
parent 9ea6f35194
commit 1a92dbcf32
1 changed files with 4 additions and 1 deletions

View File

@ -191,7 +191,10 @@ load_server() {
# dbclient doesn't support StrictHostKeyChecking but it has the -y option that works same
[ "$StrictHostKeyChecking" = "accept-new" ] && ARGS_options="$ARGS_options -y"
[ "$StrictHostKeyChecking" = "no" ] && ARGS_options="$ARGS_options -yy"
ARGS="$ARGS_options -o ExitOnForwardFailure=yes -o BatchMode=yes -nN $ARGS_tunnels -p $port $user@$hostname"
ARGS="$ARGS_options -o ExitOnForwardFailure=yes -o BatchMode=yes -nN $ARGS_tunnels "
[ -n "$port" ] && ARGS="$ARGS -p $port "
[ -n "$user" ] && ARGS="$ARGS $user@"
ARGS="${ARGS}$hostname"
procd_open_instance "$server"
procd_set_param command "$PROG" $ARGS