diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2020-03-20 11:25:52 -0400 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-03-20 13:11:27 -0700 |
commit | 855b1a65f34e266a7e972f053e73087798f92a7e (patch) | |
tree | 499fb196eb7342ac662b09ca61048378aaaf8e29 /imap-dl | |
parent | af0bd7d1033244e86ce460183d5197bad7ce2ef8 (diff) | |
download | mailscripts-855b1a65f34e266a7e972f053e73087798f92a7e.tar.gz |
imap-dl: Use "gssapi" as a synonym for "kerberos"
Robbie Harwood says that "gssapi" is more accurate.
I regularly get perplexed by the layers of SASL, GSSAPI, and Kerberos,
so i'm happy to have this alias Just Work in any case.
Suggested-by: Robbie Harwood <rharwood@redhat.com>
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Diffstat (limited to 'imap-dl')
-rwxr-xr-x | imap-dl | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -193,14 +193,14 @@ def scan_msgs(configfile:str, verbose:bool) -> None: # installed and the user has a reasonable identity in their # local credential cache, choose kerberos, otherwise, choose # "basic". - if authentication == 'kerberos': + if authentication in ['kerberos', 'gssapi']: auth_gssapi(username, imap, conf, server) elif authentication == 'basic': auth_builtin(username, imap, conf, server) else: # FIXME: implement other authentication mechanisms raise Exception(f'retriever.authentication should be one of:\n' - '"basic" or "kerberos", got "{authentication}"') + '"basic" or "gssapi" (or "kerberos"). Got "{authentication}"') if verbose: # only enable debugging after login to avoid leaking credentials in the log imap.debug = 4 |