X-Git-Url: https://git.distorted.org.uk/~mdw/with-authinfo-kludge/blobdiff_plain/e8e64c07398b864c88e709ce90e902151f95268b..b1436e12dcef42f3c96677b1aece6aa03bbfed84:/with-authinfo-kludge diff --git a/with-authinfo-kludge b/with-authinfo-kludge index d98aa83..f3bb428 100755 --- a/with-authinfo-kludge +++ b/with-authinfo-kludge @@ -200,7 +200,7 @@ sub chew_cli_server_configs (\@) { ARG: for (;;) { last ARG unless @$args; - my $arg = shift $args; + my $arg = shift @$args; if ($arg eq "+") { last ARG; } elsif ($arg =~ /^\+/) { $server = substr $arg, 1; @@ -298,7 +298,7 @@ sub dump_configuration () { for my $s (sort keys %S) { inform "Server `$s' parameters..."; - for my $p (sort keys $S{$s}) { inform_param $p, $S{$s}{$p}; } + for my $p (sort keys %{$S{$s}}) { inform_param $p, $S{$s}{$p}; } } } @@ -592,6 +592,8 @@ sub fix_server_config ($) { $s->{"_proxy_sockdir"} = undef; $s->{"_proxy_server"} = defined $s->{"via"} ? $s->{"sshbind"} : $s->{"remote"}; + $s->{"_proxy_server"} =~ s/:119$//; + $s->{"_proxy_server"} =~ s/^\[(.*)\]$/$1/; $s->{"_sshkid"} = undef; $s->{"_ssh_master"} = undef; }