From 25de2a02048897752df356189017b22a49d37f88 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 31 May 2017 18:03:12 -0700 Subject: More death to line continuations --- demos/forward.py | 2 +- demos/rforward.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'demos') diff --git a/demos/forward.py b/demos/forward.py index 96e1700d..c478e217 100644 --- a/demos/forward.py +++ b/demos/forward.py @@ -105,7 +105,7 @@ def verbose(s): print(s) -HELP = """\ +HELP = """ Set up a forward tunnel across an SSH server, using paramiko. A local port (given with -p) is forwarded across an SSH session to an address:port from the SSH server. This is similar to the openssh -L option. diff --git a/demos/rforward.py b/demos/rforward.py index ae70670c..d015cebb 100755 --- a/demos/rforward.py +++ b/demos/rforward.py @@ -85,7 +85,7 @@ def verbose(s): print(s) -HELP = """\ +HELP = """ Set up a reverse forwarding tunnel across an SSH server, using paramiko. A port on the SSH server (given with -p) is forwarded across an SSH session back to the local machine, and out to a remote site reachable from this -- cgit v1.2.3 From 14861487ec7633699fe8ea40eef6702d5ab771b5 Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Wed, 31 May 2017 18:19:15 -0700 Subject: This previous tweak was overzealous. These backslashes are OK! --- demos/forward.py | 2 +- demos/rforward.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'demos') diff --git a/demos/forward.py b/demos/forward.py index c478e217..96e1700d 100644 --- a/demos/forward.py +++ b/demos/forward.py @@ -105,7 +105,7 @@ def verbose(s): print(s) -HELP = """ +HELP = """\ Set up a forward tunnel across an SSH server, using paramiko. A local port (given with -p) is forwarded across an SSH session to an address:port from the SSH server. This is similar to the openssh -L option. diff --git a/demos/rforward.py b/demos/rforward.py index d015cebb..ae70670c 100755 --- a/demos/rforward.py +++ b/demos/rforward.py @@ -85,7 +85,7 @@ def verbose(s): print(s) -HELP = """ +HELP = """\ Set up a reverse forwarding tunnel across an SSH server, using paramiko. A port on the SSH server (given with -p) is forwarded across an SSH session back to the local machine, and out to a remote site reachable from this -- cgit v1.2.3 From afbcd96fcca5aa4ccb72421d9660874586cbef4f Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Thu, 1 Jun 2017 12:42:35 -0700 Subject: Remove unused value from demo/test. Honestly not sure WTF --- demos/demo_server.py | 4 +--- tests/test_ssh_gss.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'demos') diff --git a/demos/demo_server.py b/demos/demo_server.py index 4867e9ca..3a7ec854 100644 --- a/demos/demo_server.py +++ b/demos/demo_server.py @@ -96,9 +96,7 @@ class Server (paramiko.ServerInterface): return paramiko.AUTH_FAILED def enable_auth_gssapi(self): - UseGSSAPI = True - GSSAPICleanupCredentials = False - return UseGSSAPI + return True def get_allowed_auths(self, username): return 'gssapi-keyex,gssapi-with-mic,password,publickey' diff --git a/tests/test_ssh_gss.py b/tests/test_ssh_gss.py index e20d348f..967b3b81 100644 --- a/tests/test_ssh_gss.py +++ b/tests/test_ssh_gss.py @@ -43,9 +43,7 @@ class NullServer (paramiko.ServerInterface): return paramiko.AUTH_FAILED def enable_auth_gssapi(self): - UseGSSAPI = True - GSSAPICleanupCredentials = True - return UseGSSAPI + return True def check_channel_request(self, kind, chanid): return paramiko.OPEN_SUCCEEDED -- cgit v1.2.3