From 855b1a65f34e266a7e972f053e73087798f92a7e Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 20 Mar 2020 11:25:52 -0400 Subject: 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 Signed-off-by: Daniel Kahn Gillmor --- imap-dl | 4 ++-- imap-dl.1.pod | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/imap-dl b/imap-dl index c98f575..5a8494c 100755 --- a/imap-dl +++ b/imap-dl @@ -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 diff --git a/imap-dl.1.pod b/imap-dl.1.pod index 204b430..402a167 100644 --- a/imap-dl.1.pod +++ b/imap-dl.1.pod @@ -44,8 +44,8 @@ options: B is the dns name of the mailserver. B is either "basic" (the default, using the -IMAP LOGIN verb) or "kerberos" (IMAP AUTHENTICATE with GSSAPI, -requires the python3-gssapi module). +IMAP LOGIN verb) or "gssapi" (IMAP AUTHENTICATE with GSSAPI, requires +the python3-gssapi module). "kerberos" is an alias for "gssapi". B is the username of the IMAP account. -- cgit v1.2.3