Change "IP" to "HOST" in the --server arg.

[haeredes.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 4aa0c326de6f5ebbc81bd371a1c46c31dac10bd0..6b276b7980b9b5687493f6b72ab46590d5fb9b9d 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -28,10 +28,16 @@ import DNS (
   lookupMX',
   lookupNS',
   normalize,
+  normalize_case,
   resolve_address )
 import ExitCodes (exit_bad_server)
 
-report :: (Domain, Maybe [Domain]) -> IO ()
+
+-- | Report results for this LookupResult. If there's a Nothing in the
+--   second component, there were no query results, so we report that
+--   the domain was not delegated. If there were some results and
+--   there are leftovers (after "cleaning"), we report those as well.
+report :: LookupResult -> IO ()
 report (d, Nothing) =
   putStrLn $ "Domain " ++ (show d) ++ " not delegated."
 report (d, Just leftovers) =
@@ -41,6 +47,11 @@ report (d, Just leftovers) =
                " delegates somewhere else: " ++
                (join " " (map show leftovers))
 
+
+-- | "Clean" a lookup result by subtracting out the list of delegates.
+--   There shouldn't be anything left over. If there were no lookup
+--   results, we leave the Nothing in place so that 'report' can
+--   pattern match on it.
 clean :: [Domain] -- ^ List of delegates, @ds@
       -> LookupResult
       -> LookupResult
@@ -63,9 +74,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 +98,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