| |
@@ -757,11 +757,12 @@
|
| |
session.login()
|
| |
elif options.authtype == "kerberos" or options.authtype is None:
|
| |
try:
|
| |
- if getattr(options, 'keytab', None) and getattr(options, 'principal', None):
|
| |
- session.gssapi_login(principal=options.principal, keytab=options.keytab,
|
| |
- proxyuser=runas)
|
| |
- else:
|
| |
- session.gssapi_login(proxyuser=runas)
|
| |
+ kwargs = {'proxyuser': runas}
|
| |
+ if getattr(options, 'principal', None):
|
| |
+ kwargs['principal'] = options.principal
|
| |
+ if getattr(options, 'keytab', None):
|
| |
+ kwargs['keytab'] = options.keytab
|
| |
+ session.gssapi_login(**kwargs)
|
| |
except socket.error as e:
|
| |
warn("Could not connect to Kerberos authentication service: %s" % e.args[1])
|
| |
if not noauth and not session.logged_in:
|
| |
tkopecek
commented a year ago
Updated #3683