Support hostnames as --server arguments.

[haeredes.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 0c215b758a59501b6d4c8bd049a5dd4cab53e9ee..4aa0c326de6f5ebbc81bd371a1c46c31dac10bd0 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -4,13 +4,13 @@ where
 import Control.Concurrent.ParallelIO.Global (
   parallel,
   stopGlobalPool )
+import Control.Monad (unless)
 import qualified Data.ByteString.Char8 as BS (
   getContents,
   pack,
   words )
 import Data.List ((\\))
 import Data.String.Utils (join)
-
 import Network.DNS (
   Domain,
   FileOrNumericHost(RCHostName),
@@ -18,24 +18,28 @@ import Network.DNS (
   defaultResolvConf,
   makeResolvSeed,
   withResolver )
+import System.Exit (ExitCode(..), exitWith)
+import System.IO (hPutStrLn, stderr)
+
 
 import CommandLine (Args(..), get_args)
 import DNS (
   LookupResult,
   lookupMX',
   lookupNS',
-  normalize )
+  normalize,
+  resolve_address )
+import ExitCodes (exit_bad_server)
 
 report :: (Domain, Maybe [Domain]) -> IO ()
 report (d, Nothing) =
   putStrLn $ "Domain " ++ (show d) ++ " not delegated."
 report (d, Just leftovers) =
-  if null leftovers
-  then return ()
-  else putStrLn $ "Domain " ++
-                  (show d) ++
-                  " delegates somewhere else: " ++
-                  (join " " (map show leftovers))
+  unless (null leftovers) $
+    putStrLn $ "Domain " ++
+               (show d) ++
+               " delegates somewhere else: " ++
+               (join " " (map show leftovers))
 
 clean :: [Domain] -- ^ List of delegates, @ds@
       -> LookupResult
@@ -63,9 +67,17 @@ main = do
   let nrml_domains   = map normalize raw_domains
   let nrml_delegates = map normalize raw_delegates
 
-  let rc = case (server cfg) of
-             Nothing -> defaultResolvConf
-             Just s -> defaultResolvConf { resolvInfo = RCHostName s }
+  rc <- case (server cfg) of
+          Nothing -> return defaultResolvConf
+          Just s -> do
+            s' <- resolve_address s
+            case s' of
+              Nothing -> do
+                hPutStrLn stderr ("Bad DNS server or lookup error: " ++ s)
+                exitWith (ExitFailure exit_bad_server)
+              Just s'' ->
+                return $ defaultResolvConf { resolvInfo =
+                                               RCHostName (show s'') }
 
   rs <- makeResolvSeed rc