basic internal ipv6 support

[hcoop/domtool2.git] / src / domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 3e212a2..90afaad 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -30,7 +30,7 @@ fun set_context ctx = ssl_context := SOME ctx
 fun get_context () = valOf (!ssl_context)
 
 val nodes = map #1 Config.nodeIps
-val nodeMap = foldl (fn ((node, ip), mp) => SM.insert (mp, node, ip))
+val nodeMap = foldl (fn ((node, ip, ipv6), mp) => SM.insert (mp, node, ip))
                    SM.empty Config.nodeIps
 fun nodeIp node = valOf (SM.find (nodeMap, node))
 
@@ -134,15 +134,18 @@ fun validDomain s =
 fun validNode s = List.exists (fn s' => s = s') nodes
 
 fun yourDomain s = !fakePrivs orelse SS.member (your_domains (), s)
-fun yourUser s = SS.member (your_users (), s)
-fun yourGroup s = SS.member (your_groups (), s)
+fun yourUser s = !fakePrivs orelse SS.member (your_users (), s)
+fun yourGroup s = !fakePrivs orelse SS.member (your_groups (), s)
+
 fun checkPath paths path =
+    !fakePrivs orelse
     (List.all (fn s => s <> "..") (String.fields (fn ch => ch = #"/") path)
      andalso CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"." orelse ch = #"/"
                                      orelse ch = #"-" orelse ch = #"_") path
      andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (paths ()))
 val yourPath = checkPath your_paths
 val readablePath = checkPath readable_paths
+
 fun yourIp s = !fakePrivs orelse SS.member (your_ips (), s)
 
 fun yourDomainHost s =
@@ -276,6 +279,10 @@ val _  = Env.registerFunction ("defaultMailbox",
                               fn [] => SOME (EString (getUser ()), dl)
                               | _ => NONE)
 
+val _  = Env.registerFunction ("defaultMailUser",
+                              fn [] => SOME (EString (getUser ()), dl)
+                              | _ => NONE)
+
 
 type soa = {ns : string,
            serial : int option,
@@ -654,7 +661,6 @@ val _ = Env.containerV_one "domain"
 
                                           val slaveIps = map nodeIp (#slaves dns)
                                       in
-                                          app (saveSoa ("slave", #soa dns)) (#slaves dns);
                                           app (saveNamed ("slave", #soa dns, masterIp, slaveIps)) (#slaves dns);
                                           case #master dns of
                                               InternalMaster node =>
@@ -686,7 +692,7 @@ fun handleSite (site, files) =
        
     in
        print ("New configuration for node " ^ site ^ "\n");
-       if site = Config.defaultNode then
+       if site = Config.dispatcherName then
            Slave.handleChanges files
        else let
                val bio = OpenSSL.connect true (valOf (!ssl_context),
@@ -788,7 +794,7 @@ val _ = Env.type_one "mail_node"
 
 fun rmdom' delete resultRoot doms =
     let
-       fun doNode (node, _) =
+       fun doNode (node, _, _) =
            let
                val dname = OS.Path.joinDirFile {dir = resultRoot,
                                                 file = node}
@@ -837,7 +843,7 @@ fun rmdom' delete resultRoot doms =
            end
                handle IO.Io _ => print ("Warning: IO error deleting domains on " ^ node ^ ".\n")
 
-       fun cleanupNode (node, _) =
+       fun cleanupNode (node, _, _) =
            let
                fun doDom dom =
                    let
@@ -866,6 +872,7 @@ fun homedirOf uname =
     Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam uname)
 
 fun homedir () = homedirOf (getUser ())
+                handle e => if !fakePrivs then "/tmp" else raise e
 
 type subject = {node : string, domain : string}