_known_hosts_real: Handle more than two hostnames per known hosts line (Debian: #647352).
parent
b54d3f022f
commit
333a5a50be
|
@ -1417,7 +1417,7 @@ _known_hosts_real()
|
|||
/^\s*[^|\#]/ {
|
||||
sub("^@[^ ]+ +", ""); \
|
||||
sub(" .*$", ""); \
|
||||
for (i=1; i<=2; ++i) { \
|
||||
for (i=1; i<=NF; ++i) { \
|
||||
sub("^\\[", "", $i); sub("\\](:[0-9]+)?$", "", $i); \
|
||||
if ($i ~ /'"$awkcur"'/) {print $i} \
|
||||
}}' "${kh[@]}" 2>/dev/null ) )
|
||||
|
|
|
@ -1 +1 @@
|
|||
two
|
||||
two,two2,two3,two4
|
||||
|
|
|
@ -52,8 +52,8 @@ set test "Files containing consecutive spaces should work"
|
|||
set hosts [get_hosts -unsorted]
|
||||
set hosts_orig $hosts
|
||||
# Hosts `gee' and `hus' are defined in `./fixtures/_known_hosts_real/spaced conf'
|
||||
# Host `two' is defined in ./fixtures/_known_hosts_real/known_hosts2
|
||||
lappend hosts gee hus two
|
||||
# Hosts `two*' are defined in ./fixtures/_known_hosts_real/known_hosts2
|
||||
lappend hosts gee hus two two2 two3 two4
|
||||
set hosts_config $hosts
|
||||
# Hosts `doo' and `ike' are defined in `./fixtures/_known_hosts_/spaced known_hosts'
|
||||
lappend hosts doo ike
|
||||
|
@ -78,9 +78,9 @@ sync_after_int
|
|||
|
||||
set test "Files starting with tilde (~) should work"
|
||||
set hosts [get_hosts -unsorted]
|
||||
# Host `two' is defined in ./fixtures/_known_hosts_real/known_hosts2
|
||||
# Hosts `two*' are defined in ./fixtures/_known_hosts_real/known_hosts2
|
||||
# Host `three' is defined in ./fixtures/_known_hosts_real/known_hosts3
|
||||
lappend hosts two three
|
||||
lappend hosts two two2 two3 two4 three
|
||||
set hosts [join [bash_sort $hosts] "\\s+"]
|
||||
# Setup environment
|
||||
set cmd {OLDHOME=$HOME; HOME=$SRCDIRABS}
|
||||
|
|
Loading…
Reference in New Issue