X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=systems%2Feldiron%2Fbase.nix;h=a77a438e455d9bbe7c207067e4915f861ef6db2b;hb=ce983e8b05d17adbf6b8228b990e5a512835ca56;hpb=0503b1f07e839e2da7c2b26139eafeaee627a4a6;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/systems/eldiron/base.nix b/systems/eldiron/base.nix index 24e05fe..a77a438 100644 --- a/systems/eldiron/base.nix +++ b/systems/eldiron/base.nix @@ -175,7 +175,7 @@ table = ldap_users user_column = login pw_type = function - auth_query = SELECT (mechanism = 'SSHA' AND password = encode(digest( %p || salt, 'sha1'), 'hex')) FROM ldap_users WHERE login = %u OR login || '@' || realm = %u + auth_query = SELECT ((mechanism = 'SSHA' AND password = encode(digest( %p || salt, 'sha1'), 'hex')) OR (mechanism = 'PLAIN' AND password = %p)) FROM ldap_users WHERE login = %u OR login || '@' || realm = %u #pwd_query = WITH newsalt as (select gen_random_bytes(4)) UPDATE ldap_users SET password = encode(digest( %p || (SELECT * FROM newsalt), 'sha1'), 'hex'), salt = (SELECT * FROM newsalt), mechanism = 'SSHA' WHERE login = %u OR login || '@' || realm = %u ''; };