diff --git a/setup.py b/setup.py index f48dadc..40af978 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ def read(fname): setup( name='spur', - version='0.3.23', + version='0.3.24', description='Run commands and manipulate files locally or over SSH using the same interface', long_description=read("README.rst"), author='Michael Williamson', diff --git a/spur/ssh.py b/spur/ssh.py index 6ee0c24..61e73dd 100644 --- a/spur/ssh.py +++ b/spur/ssh.py @@ -127,7 +127,12 @@ def __init__(self, shell_type=None, look_for_private_keys=True, load_system_host_keys=True, - sock=None): + sock=None, + gss_auth=False, + gss_kex=False, + gss_deleg_creds=True, + gss_host=None, + gss_trust_dns=True): if connect_timeout is None: connect_timeout = _ONE_MINUTE @@ -155,6 +160,12 @@ def __init__(self, else: self._missing_host_key = missing_host_key + self._gss_auth = gss_auth + self._gss_kex = gss_kex + self._gss_deleg_creds = gss_deleg_creds + self._gss_host = gss_host + self._gss_trust_dns = gss_trust_dns + self._shell_type = shell_type def __enter__(self): @@ -289,7 +300,12 @@ def _connect_ssh(self): key_filename=self._private_key_file, look_for_keys=self._look_for_private_keys, timeout=self._connect_timeout, - sock=self._sock + sock=self._sock, + gss_auth=self._gss_auth, + gss_kex=self._gss_kex, + gss_deleg_creds=self._gss_deleg_creds, + gss_host=self._gss_host, + gss_trust_dns=self._gss_trust_dns, ) self._client = client return self._client