X-Git-Url: http://gitweb.michael.orlitzky.com/?p=haeredes.git;a=blobdiff_plain;f=src%2FMain.hs;h=5c6f401f7a5e839b6f5545bd4e4bba91cd6b3195;hp=4aa0c326de6f5ebbc81bd371a1c46c31dac10bd0;hb=7cc26ab4bfa90c4abe0c741d5a3eaf575544466a;hpb=e8fe3d4c76b719d256a3c04d462819cd98218111 diff --git a/src/Main.hs b/src/Main.hs index 4aa0c32..5c6f401 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -28,6 +28,7 @@ import DNS ( lookupMX', lookupNS', normalize, + normalize_case, resolve_address ) import ExitCodes (exit_bad_server) @@ -63,9 +64,14 @@ main = do -- Convert these to ByteStrings. let raw_delegates = map BS.pack (delegates cfg) + let normalize_function = + if (no_append_root cfg) + then normalize_case + else normalize + -- Normalize the given names and delegates - let nrml_domains = map normalize raw_domains - let nrml_delegates = map normalize raw_delegates + let nrml_domains = map normalize_function raw_domains + let nrml_delegates = map normalize_function raw_delegates rc <- case (server cfg) of Nothing -> return defaultResolvConf @@ -82,8 +88,8 @@ main = do rs <- makeResolvSeed rc let lookup_function = case cfg of - (NS _ _) -> lookupNS' - (MX _ _) -> lookupMX' + (NS _ _ _) -> lookupNS' + (MX _ _ _) -> lookupMX' _ <- withResolver rs $ \resolver -> do -- Bad stuff happens if we try to run these lookups in parallel