diff options
author | Sean Johnson <seanjohnson@nbnco.com.au> | 2014-11-11 13:15:08 +1100 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-12-17 15:34:59 -0800 |
commit | d120ce4f06da5866c76e5e61196742a89f3c54c3 (patch) | |
tree | 355d8edab20e335c743c01c4587b19c0fa5b9ee7 /paramiko/config.py | |
parent | e5b105ca57b21b3142a80f29ee07e2a5e87ac547 (diff) | |
download | paramiko-d120ce4f06da5866c76e5e61196742a89f3c54c3.tar.gz |
Added check for proxycommand none and associated test as per Paramiko Issue 415
Conflicts:
tests/test_util.py
Diffstat (limited to 'paramiko/config.py')
-rw-r--r-- | paramiko/config.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/paramiko/config.py b/paramiko/config.py index 91943ffb..233a87d9 100644 --- a/paramiko/config.py +++ b/paramiko/config.py @@ -73,6 +73,9 @@ class SSHConfig (object): 'host': self._get_hosts(value), 'config': {} } + elif key == 'proxycommand' and value.lower() == 'none': + # Proxycommands of none should not be added as an actual value. (Issue #415) + continue else: if value.startswith('"') and value.endswith('"'): value = value[1:-1] |