From: Simo Sorce Date: Tue, 17 Jun 2014 19:16:55 +0000 (-0400) Subject: Prefer the 'form' login manager in ipa setups X-Git-Tag: v0.3.0~114 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=1ec8e6299c1c4a270a7b6ebf6916d938923cc72c Prefer the 'form' login manager in ipa setups Signed-off-by: Simo Sorce Reviewed-by: Patrick Uiterwijk - Replaced "all(lm not in" with "not any(lm in" --- diff --git a/ipsilon/helpers/ipa.py b/ipsilon/helpers/ipa.py index 54d5199..4a4849a 100755 --- a/ipsilon/helpers/ipa.py +++ b/ipsilon/helpers/ipa.py @@ -183,6 +183,6 @@ class Installer(object): opts['krb'] = 'yes' if 'krb' not in opts['lm_order']: opts['lm_order'].insert(0, 'krb') - opts['pam'] = 'yes' - if 'pam' not in opts['lm_order']: - opts['lm_order'].append('pam') + opts['form'] = 'yes' + if not any(lm in opts['lm_order'] for lm in ('form', 'pam')): + opts['lm_order'].append('form')