X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=pdns-pipe-nmc.hs;h=1f5a8918675d40f34ce66b49d59ae88c2e2df90c;hp=dbb7853770d3027d46a2e83a83b19ab44fd1627f;hb=HEAD;hpb=3b51a3a5c335293966447ccc5c758c19e9b669c2

diff --git a/pdns-pipe-nmc.hs b/pdns-pipe-nmc.hs
index dbb7853..1f5a891 100644
--- a/pdns-pipe-nmc.hs
+++ b/pdns-pipe-nmc.hs
@@ -22,7 +22,7 @@ import Data.Map.Lazy (Map, empty, lookup, insert, delete, size)
 import Data.Aeson (encode, decode, Value(..))
 import Network.HTTP.Types
 import Network.HTTP.Client
-#if MIN_VERSION_data_default(0,5,3)
+#if MIN_VERSION_http_client(0,3,0)
 import Data.Default.Class (def)
 #else
 import Data.Default (def)
@@ -104,6 +104,7 @@ mainPdnsNmc = do
       ["HELO", "1"] -> return 1
       ["HELO", "2"] -> return 2
       ["HELO", "3"] -> return 3
+      ["HELO", "4"] -> return 4
       ["HELO",  x ] -> loopErr $ "unsupported ABI version " ++ (show x)
       _             -> loopErr $ "bad HELO " ++ (show s)
 
@@ -143,14 +144,26 @@ mainPdnsNmc = do
   -- end debug
   -}
               put $ stow qname (count, cache)
-            PdnsRequestAXFR xrq ->
-              case fetch xrq cache of
-                Nothing ->
-                  io $ putStr $
-                    pdnsReport ("AXFR for unknown id: " ++ (show xrq))
+            PdnsRequestAXFR xrq zid -> do
+  {-
+  -- debug
+              io $ putStrLn $ "LOG\tAXFR request id=" ++ (show xrq)
+                                ++ ", zone name: " ++ (show zid)
+  -- end debug
+  -}
+              let
+                czone = fetch xrq cache
+                zone = case zid of
+                  Nothing    -> czone
+                  Just qname -> Just qname
+                    -- if zid == czone then zid else Nothing -- paranoid
+              case zone of
                 Just qname ->
                   io $ queryDom (queryOpNmc cfg mgr xrq) qname
-                    >>= putStr . (pdnsOutXfr ver count gen qname)
+                     >>= putStr . (pdnsOutXfr ver count gen qname)
+                Nothing ->
+                  io $ putStr $ pdnsReport $ "AXFR cannot determine zone: "
+                                          ++ (show xrq) ++ ", " ++ (show zid)
             PdnsRequestPing -> io $ putStrLn "END"
 
   runStateT mainloop (0, empty) >> return ()