Skip to content

Commit

Permalink
Merge pull request #2970 from sharteeya/fix/comware_su
Browse files Browse the repository at this point in the history
Fix comware.rb login/password regex
  • Loading branch information
robertcheramy authored Jan 22, 2024
2 parents 1381043 + 7a1d0cb commit 469668f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
- Remove constantly updating dates from backup of Adtran config (@davesbell)
- fixed prompt for Cumulus to allow usernames with dots and dashes (@ktims)
- fixed source http when source is librenms (@davama)
- Fixed login and su regex unable to match in some comware devices (@sharteeya)
- fixed prompt detection for Netgear M4250-10G2XF-PoE+ and M4300-28G-PoE+ (@rexhaugen)
- fixed devices (pfsense, opnsense, openwrt) not retriving config after refinement change #2771 #2968 (@robertcheramy)
- Fixed login into Fortigate when post-login-baned ist enabled. Fixes #2021 (@chrisr0880, @sahdan, @dangoscomb and @robertcheramy)
Expand Down
4 changes: 2 additions & 2 deletions lib/oxidized/model/comware.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Comware < Oxidized::Model
end

cfg :telnet do
username /^(Username|login):/
username /^(Username|[Ll]ogin):/
password /^Password:/
end

Expand All @@ -37,7 +37,7 @@ class Comware < Oxidized::Model
if vars(:enable) == true
cmd "super"
elsif vars(:enable)
cmd "super", /^ [pP]assword:/
cmd "super", /^\s?[pP]assword:/
cmd vars(:enable)
end
end
Expand Down

0 comments on commit 469668f

Please sign in to comment.