Commit cfc438dc authored by Nigel Kukard's avatar Nigel Kukard

Merge branch 'socketfix' into 'master'

Default login port if not defined in the socket name

See merge request !43
parents d05a9d15 75fbd0de
Pipeline #1200 passed with stages
in 3 minutes and 17 seconds
......@@ -76,7 +76,7 @@ use User::pwent;
my $NAME = "AWIT-SSH-Client";
our $VERSION = "0.8.7";
our $VERSION = "0.8.8";
print(STDERR "$NAME v$VERSION - Copyright (c) 2016-2017, AllWorldIT\n\n");
......@@ -804,7 +804,7 @@ if (defined($forwardSocket)) {
my $vncPort = 5900 + $vncDisplay;
# Add forward socket name
$libvirtSocket = "$TMPDIR/awit-ssh-vnc-".sha1_hex("$loginHost:$loginPort:$libvirtVNC $$").".sock";
$libvirtSocket = "$TMPDIR/awit-ssh-vnc-".sha1_hex("$loginHost:".($loginPort // 22).":$libvirtVNC $$").".sock";
my @libvirtArgs = ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment