summaryrefslogtreecommitdiffhomepage
path: root/demos
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-06-06 12:31:57 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-06-06 12:31:57 -0700
commita2da21d46bb9a441dbb8da570262bb424e1f9450 (patch)
tree8e1c7bdd402fb640f75b061bc2051f5fe6eba676 /demos
parent79fcbdad812cc3be39afbf8375c11e0581eeb86e (diff)
parentd285b80ecb6102b0ad501b74d02e04d61e8ec632 (diff)
Merge branch '2.0' into 667-int
Diffstat (limited to 'demos')
-rw-r--r--demos/demo_server.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/demos/demo_server.py b/demos/demo_server.py
index c4af9b10..3a7ec854 100644
--- a/demos/demo_server.py
+++ b/demos/demo_server.py
@@ -40,7 +40,7 @@ print('Read key: ' + u(hexlify(host_key.get_fingerprint())))
class Server (paramiko.ServerInterface):
- # 'data' is the output of base64.encodestring(str(key))
+ # 'data' is the output of base64.b64encode(key)
# (using the "user_rsa_key" files)
data = (b'AAAAB3NzaC1yc2EAAAABIwAAAIEAyO4it3fHlmGZWJaGrfeHOVY7RWO3P9M7hp'
b'fAu7jJ2d7eothvfeuoRFtJwhUmZDluRdFyhFY/hFAh76PJKGAusIqIQKlkJxMC'
@@ -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'