diff options
author | Jeremy T. Bouse <jbouse@debian.org> | 2014-02-14 21:29:59 -0500 |
---|---|---|
committer | Jeremy T. Bouse <jbouse@debian.org> | 2014-02-14 21:29:59 -0500 |
commit | 3f4d155d984fd27cedd0a333bf44e4724f33e30a (patch) | |
tree | ee06fc2a9ec6c5f144015dcbd67763f539d9aa51 /paramiko/channel.py | |
parent | d45f78c1381a1f583306c5b6a89989f478980c2f (diff) | |
parent | 3bb46c9cb414ca82afab715d2d0cc00ed71cfb6d (diff) | |
download | python-paramiko-3f4d155d984fd27cedd0a333bf44e4724f33e30a.tar python-paramiko-3f4d155d984fd27cedd0a333bf44e4724f33e30a.tar.gz |
Merge tag 'upstream/1.12.2'
Upstream version 1.12.2
Diffstat (limited to 'paramiko/channel.py')
-rw-r--r-- | paramiko/channel.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/paramiko/channel.py b/paramiko/channel.py index 0c603c6..d1e6333 100644 --- a/paramiko/channel.py +++ b/paramiko/channel.py @@ -7,7 +7,7 @@ # Software Foundation; either version 2.1 of the License, or (at your option) # any later version. # -# Paramiko is distrubuted in the hope that it will be useful, but WITHOUT ANY +# Paramiko is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more # details. @@ -1027,6 +1027,13 @@ class Channel (object): ok = False else: ok = server.check_channel_shell_request(self) + elif key == 'env': + name = m.get_string() + value = m.get_string() + if server is None: + ok = False + else: + ok = server.check_channel_env_request(self, name, value) elif key == 'exec': cmd = m.get_string() if server is None: |