regression: readd lost USERPASS SASL meta-mechanism

This commit is contained in:
jesopo 2020-02-07 00:14:05 +00:00
parent d588760fc4
commit 29fdc3ce53

View file

@ -13,12 +13,13 @@ USERPASS_MECHANISMS = [
"PLAIN" "PLAIN"
] ]
ALL_MECHANISMS = USERPASS_MECHANISMS+["EXTERNAL"] ALL_MECHANISMS = USERPASS_MECHANISMS+["EXTERNAL"]
SETTING_MECHANISMS = ALL_MECHANISMS+["USERPASS"]
def _parse(value): def _parse(value):
mechanism, _, arguments = value.partition(" ") mechanism, _, arguments = value.partition(" ")
mechanism = mechanism.upper() mechanism = mechanism.upper()
if mechanism in ALL_MECHANISMS: if mechanism in SETTING_MECHANISMS:
return {"mechanism": mechanism.upper(), "args": arguments} return {"mechanism": mechanism.upper(), "args": arguments}
else: else:
raise utils.settings.SettingParseException( raise utils.settings.SettingParseException(