Commit 4095c9de authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Eliminate the sshd option checking dependency on wc and make it faster.

parent 20d33ad7

tests/sshserver.pl

+1 −2
Original line number Original line Diff line number Diff line
@@ -115,8 +115,7 @@ if (($ssh_daemon !~ /OpenSSH/) || (10 * $ssh_ver_major + $ssh_ver_minor < 37)) { 
# Check here for possible unsupported options, avoiding its use in sshd.

# Check here for possible unsupported options, avoiding its use in sshd.

sub sshd_supports_opt($) {

sub sshd_supports_opt($) {

    my ($option) = @_;

    my ($option) = @_;

    my $err = 1;

    my $err = grep /$option/, qx($sshd -t -o $option=no 2>&1);

    chomp($err = qx($sshd -t -o $option=no 2>&1 | grep $option 2>&1 | wc -l));

    return !$err;

    return !$err;

}

}