Support hostnames as --server arguments.

[haeredes.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 4da383352360ee4a37a552805a5da88897c27c4f..4aa0c326de6f5ebbc81bd371a1c46c31dac10bd0 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -11,7 +11,6 @@ import qualified Data.ByteString.Char8 as BS (
   words )
 import Data.List ((\\))
 import Data.String.Utils (join)
   words )
 import Data.List ((\\))
 import Data.String.Utils (join)

-

 import Network.DNS (
   Domain,
   FileOrNumericHost(RCHostName),
 import Network.DNS (
   Domain,
   FileOrNumericHost(RCHostName),


@@ -19,13 +18,18 @@ import Network.DNS (
   defaultResolvConf,
   makeResolvSeed,
   withResolver )
   defaultResolvConf,
   makeResolvSeed,
   withResolver )

+import System.Exit (ExitCode(..), exitWith)
+import System.IO (hPutStrLn, stderr)
+

 
 import CommandLine (Args(..), get_args)
 import DNS (
   LookupResult,
   lookupMX',
   lookupNS',
 
 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) =
 
 report :: (Domain, Maybe [Domain]) -> IO ()
 report (d, Nothing) =


@@ -63,9 +67,17 @@ main = do
   let nrml_domains   = map normalize raw_domains
   let nrml_delegates = map normalize raw_delegates
 
   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
 
 
   rs <- makeResolvSeed rc