diff options
| author | tobigrimm <tobi-github@grimm.gr> | 2020-04-25 01:40:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-25 09:40:39 +1000 |
| commit | 966fd0c5231d56c4f464752865d96f97bd3c0aac (patch) | |
| tree | 3dc75ed4d2763ca251c8bf892832d3949b8ab5f4 /sshuttle/options.py | |
| parent | 580462156e49e905e371ae7de01e86a811ccdbbb (diff) | |
Fix parsing of hostnames to allow ssh aliases defined in ssh configs) (#418)
* Fix parsing of hostnames to allow ssh aliases defined in ssh configs)
* nicer formatting, pep8 applied
* Properly parse IPv6 addresses with port specification
* Now also handles hostnames with port specified and IPv6 addresses without port properly
* Updated parameter description for the remotehost specification
* Make the urlparse import backwards compatible to python2
Co-authored-by: Tobi <tobi-git@grimm.gr>
Diffstat (limited to 'sshuttle/options.py')
| -rw-r--r-- | sshuttle/options.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshuttle/options.py b/sshuttle/options.py index 79c404b..12ce55d 100644 --- a/sshuttle/options.py +++ b/sshuttle/options.py @@ -177,9 +177,9 @@ parser.add_argument( ) parser.add_argument( "-r", "--remote", - metavar="[USERNAME@]ADDR[:PORT]", + metavar="[USERNAME[:PASSWORD]@]ADDR[:PORT]", help=""" - ssh hostname (and optional username) of remote %(prog)s server + ssh hostname (and optional username and password) of remote %(prog)s server """ ) parser.add_argument( |