X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=NmcDom.hs;h=dac614ba123e241be7c68e3b6c5bc379ff30f85f;hp=2fdd6b99a3b41df75dd71c210d23aa2e29992796;hb=92504303416dfc46f1a4e4ed45ddd3203919cf8f;hpb=851c71d42654a1620ea98d2dfe751d2e7fbc961f;ds=sidebyside diff --git a/NmcDom.hs b/NmcDom.hs index 2fdd6b9..dac614b 100644 --- a/NmcDom.hs +++ b/NmcDom.hs @@ -182,7 +182,7 @@ instance Mergeable NmcRRI2p where data NmcRRTlsa = NmcRRTlsa { tlsMatchType :: Int -- 0:exact 1:sha256 2:sha512 , tlsMatchValue :: String - , tlsIncSubdoms :: Int -- 1:enforce on subdoms 0:no + , tlsIncSubdoms :: Bool -- enforce on subdoms? } deriving (Show, Eq) instance FromJSON NmcRRTlsa where @@ -190,7 +190,10 @@ instance FromJSON NmcRRTlsa where if length a == 3 then NmcRRTlsa <$> parseJSON (a ! 0) <*> parseJSON (a ! 1) - <*> parseJSON (a ! 2) + <*> case (a ! 2) of + Number 0 -> return False + Number 1 -> return True + _ -> empty else empty parseJSON _ = empty