X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FAuthorization.hs;h=ccc4b36c477318177f064fdca75f79d7ab43b427;hb=a4b849476ee3a204ea91dee8f3fd235b0b33a10a;hp=be7f490e935b0f4e491069cbd1736e8c42298ed6;hpb=547fd6221931c8025085db91f7424db850156129;p=Rakka.git diff --git a/Rakka/Authorization.hs b/Rakka/Authorization.hs index be7f490..ccc4b36 100644 --- a/Rakka/Authorization.hs +++ b/Rakka/Authorization.hs @@ -10,6 +10,7 @@ module Rakka.Authorization import qualified Codec.Binary.UTF8.String as UTF8 import Control.Concurrent.STM +import Control.Monad import Control.Monad.Trans import qualified Data.ByteString as B import Data.Map (Map) @@ -88,9 +89,8 @@ loadUserMap :: FilePath -> IO UserMap loadUserMap path = do exist <- doesFileExist path m <- if exist then - readFile path - >>= - return . M.fromList . map decodePair . fromJust . deserializeStringPairs + liftM (M.fromList . map decodePair . fromJust . deserializeStringPairs) + (readFile path) else return M.empty sha1 <- return . fromJust =<< getDigestByName "SHA1"