diff options
| -rw-r--r-- | paramiko/server.py | 19 | ||||
| -rw-r--r-- | paramiko/transport.py | 24 |
2 files changed, 23 insertions, 20 deletions
diff --git a/paramiko/server.py b/paramiko/server.py index 2a1172aa..dac9bf1e 100644 --- a/paramiko/server.py +++ b/paramiko/server.py @@ -496,17 +496,18 @@ class ServerInterface (object): def check_channel_forward_agent_request(self, channel): """ - Determine if the client will be provided with an forward agent session. If this - method returns C{True}, the server will allow SSH Agent forwarding. + Determine if the client will be provided with an forward agent session. + If this method returns C{True}, the server will allow SSH Agent + forwarding. - The default implementation always returns C{False}. + The default implementation always returns C{False}. - @param channel: the L{Channel} the request arrived on - @type channel: L{Channel} - @return: C{True} if the AgentForward was loaded; C{False} if not - @rtype: bool - """ - return False + @param channel: the L{Channel} the request arrived on + @type channel: L{Channel} + @return: C{True} if the AgentForward was loaded; C{False} if not + @rtype: bool + """ + return False def check_channel_direct_tcpip_request(self, chanid, origin, destination): """ diff --git a/paramiko/transport.py b/paramiko/transport.py index 42a371f3..41507a2f 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -673,18 +673,20 @@ class Transport (threading.Thread): prematurely """ return self.open_channel('x11', src_addr=src_addr) - + def open_forward_agent_channel(self): - """ - Request a new channel to the client, of type C{"auth-agent@openssh.com"}. - This is just an alias for C{open_channel('auth-agent@openssh.com')}. - @return: a new L{Channel} - @rtype: L{Channel} - - @raise SSHException: if the request is rejected or the session ends - prematurely - """ - return self.open_channel('auth-agent@openssh.com') + """ + Request a new channel to the client, of type + C{"auth-agent@openssh.com"}. + + This is just an alias for C{open_channel('auth-agent@openssh.com')}. + @return: a new L{Channel} + @rtype: L{Channel} + + @raise SSHException: if the request is rejected or the session ends + prematurely + """ + return self.open_channel('auth-agent@openssh.com') def open_forwarded_tcpip_channel(self, (src_addr, src_port), (dest_addr, dest_port)): """ |