More loading of lib.dtl
[hcoop/domtool2.git] / src / main.sml
index 90a0ee4..4836ed8 100644 (file)
@@ -25,15 +25,32 @@ open Ast MsgTypes Print
 structure SM = StringMap
 
 fun init () = Acl.read Config.aclFile
-           
+
+fun isLib fname = OS.Path.file fname = "lib.dtl"
+
+fun wrapFile (fname, file) =
+    case (isLib fname, file) of
+       (true, (comment, ds, SOME e)) =>
+       let
+           val (_, loc) = e
+       in
+           (comment, ds, SOME (ELocal (e, (ESkip, loc)), loc))
+       end
+      | _ => file
+
 fun check' G fname =
     let
        val prog = Parse.parse fname
+       val prog = wrapFile (fname, prog)
     in
        if !ErrorMsg.anyErrors then
            G
        else
-           Tycheck.checkFile G (Defaults.tInit ()) prog
+           (if isLib fname then
+                ()
+            else
+                Option.app (Unused.check G) (#3 prog);
+            Tycheck.checkFile G (Defaults.tInit prog) prog)
     end
 
 fun basis () =
@@ -63,12 +80,12 @@ fun basis () =
             before Tycheck.disallowExterns ())
     end
 
-fun check fname =
+(* val b = basis () *)
+
+fun check G fname =
     let
        val _ = ErrorMsg.reset ()
        val _ = Env.preTycheck ()
-
-       val b = basis ()
     in
        if !ErrorMsg.anyErrors then
            raise ErrorMsg.Error
@@ -77,24 +94,48 @@ fun check fname =
                val _ = Tycheck.disallowExterns ()
                val _ = ErrorMsg.reset ()
                val prog = Parse.parse fname
+               val prog = wrapFile (fname, prog)
            in
                if !ErrorMsg.anyErrors then
                    raise ErrorMsg.Error
                else
                    let
-                       val G' = Tycheck.checkFile b (Defaults.tInit ()) prog
+                       val G' = Tycheck.checkFile G (Defaults.tInit prog) prog
                    in
                        if !ErrorMsg.anyErrors then
                            raise ErrorMsg.Error
                        else
-                           (G', #3 prog)
+                           (if isLib fname then
+                                ()
+                            else
+                                Option.app (Unused.check G) (#3 prog);
+                            (G', #3 prog))
                    end
            end
     end
 
-val notTmp = CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"." orelse ch = #"_" orelse ch = #"-")
+fun notTmp s =
+    String.sub (s, 0) <> #"."
+    andalso CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"." orelse ch = #"_" orelse ch = #"-") s
 
-fun checkDir dname =
+fun setupUser () =
+    let
+       val user =
+           case Posix.ProcEnv.getenv "DOMTOOL_USER" of
+               NONE =>
+               let
+                   val uid = Posix.ProcEnv.getuid ()
+               in
+                   Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
+               end
+             | SOME user => user
+    in
+       Acl.read Config.aclFile;
+       Domain.setUser user;
+       user
+    end
+
+fun checkDir' dname =
     let
        val b = basis ()
 
@@ -125,12 +166,16 @@ fun checkDir dname =
                 ())
     end
 
-fun reduce fname =
+fun checkDir dname =
+    (setupUser ();
+     checkDir' dname)
+
+fun reduce G fname =
     let
-       val (G, body) = check fname
+       val (G, body) = check fname
     in
        if !ErrorMsg.anyErrors then
-           NONE
+           (G, NONE)
        else
            case body of
                SOME body =>
@@ -141,28 +186,25 @@ fun reduce fname =
                                         [PD.string "Result:",
                                          PD.space 1,
                                          p_exp body']))*)
-                   SOME body'
+                   (G, SOME body')
                end
-             | _ => NONE
+             | _ => (G, NONE)
     end
 
-fun eval fname =
-    case reduce fname of
-       (SOME body') =>
-       if !ErrorMsg.anyErrors then
-           raise ErrorMsg.Error
-       else
-           Eval.exec (Defaults.eInit ()) body'
-      | NONE => raise ErrorMsg.Error
+(*(Defaults.eInit ())*)
 
-fun eval' fname =
-    case reduce fname of
-       (SOME body') =>
+fun eval G evs fname =
+    case reduce fname of
+       (G, SOME body') =>
        if !ErrorMsg.anyErrors then
            raise ErrorMsg.Error
        else
-           ignore (Eval.exec' (Defaults.eInit ()) body')
-      | NONE => raise ErrorMsg.Error
+           let
+               val evs' = Eval.exec' evs body'
+           in
+               (G, evs')
+           end
+      | (G, NONE) => (G, evs)
 
 val dispatcher =
     Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
@@ -170,59 +212,76 @@ val dispatcher =
 val self =
     "localhost:" ^ Int.toString Config.slavePort
 
+fun context x =
+    (OpenSSL.context false x)
+    handle e as OpenSSL.OpenSSL s =>
+          (print "Couldn't find your certificate.\nYou probably haven't been given any Domtool privileges.\n";
+           print ("I looked in: " ^ #1 x ^ "\n");
+           print ("Additional information: " ^ s ^ "\n");
+           raise e)
+
 fun requestContext f =
     let
-       val user =
-           case Posix.ProcEnv.getenv "DOMTOOL_USER" of
-               NONE =>
-               let
-                   val uid = Posix.ProcEnv.getuid ()
-               in
-                   Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
-               end
-             | SOME user => user
-                  
-       val () = Acl.read Config.aclFile
-       val () = Domain.setUser user
+       val user = setupUser ()
                 
        val () = f ()
 
-       val context = OpenSSL.context (Config.certDir ^ "/" ^ user ^ ".pem",
-                                      Config.keyDir ^ "/" ^ user ^ "/key.pem",
-                                      Config.trustStore)
+       val context = context (Config.certDir ^ "/" ^ user ^ ".pem",
+                              Config.keyDir ^ "/" ^ user ^ "/key.pem",
+                              Config.trustStore)
     in
        (user, context)
     end
 
-fun requestBio f =
+fun requestBio' printErr f =
     let
        val (user, context) = requestContext f
     in
-       (user, OpenSSL.connect (context, dispatcher))
+       (user, OpenSSL.connect printErr (context, dispatcher))
     end
 
-fun requestSlaveBio () =
+val requestBio = requestBio' true
+
+fun requestSlaveBio' printErr =
     let
        val (user, context) = requestContext (fn () => ())
     in
-       (user, OpenSSL.connect (context, self))
+       (user, OpenSSL.connect printErr (context, self))
     end
 
-fun request fname =
-    let
-       val (user, bio) = requestBio (fn () => ignore (check fname))
+fun requestSlaveBio () = requestSlaveBio' true
 
-       val inf = TextIO.openIn fname
+fun request (fname, libOpt) =
+    let
+       val (user, bio) = requestBio (fn () =>
+                                        let
+                                            val env = basis ()
+                                            val env = case libOpt of
+                                                          NONE => env
+                                                        | SOME lib => #1 (check env lib)
+                                        in
+                                            ignore (check env fname)
+                                        end)
+
+       fun readFile fname =
+           let
+               val inf = TextIO.openIn fname
 
-       fun loop lines =
-           case TextIO.inputLine inf of
-               NONE => String.concat (List.rev lines)
-             | SOME line => loop (line :: lines)
+               fun loop lines =
+                   case TextIO.inputLine inf of
+                       NONE => String.concat (rev lines)
+                     | SOME line => loop (line :: lines)
+           in
+               loop []
+               before TextIO.closeIn inf
+           end
 
-       val code = loop []
+       val code = readFile fname
+       val msg = case libOpt of
+                     NONE => MsgConfig code
+                   | SOME fname' => MsgMultiConfig [readFile fname', code]
     in
-       TextIO.closeIn inf;
-       Msg.send (bio, MsgConfig code);
+       Msg.send (bio, msg);
        case Msg.recv bio of
            NONE => print "Server closed connection unexpectedly.\n"
          | SOME m =>
@@ -236,9 +295,17 @@ fun request fname =
 
 fun requestDir dname =
     let
+       val _ = if Posix.FileSys.access (dname, []) then
+                   ()
+               else
+                   (print ("Can't access " ^ dname ^ ".\n");
+                    print "Did you mean to run domtool on a specific file, instead of asking for all\n";
+                    print "files in your ~/.domtool directory?\n";
+                    OS.Process.exit OS.Process.failure)
+
        val _ = ErrorMsg.reset ()
 
-       val (user, bio) = requestBio (fn () => checkDir dname)
+       val (user, bio) = requestBio (fn () => checkDir' dname)
 
        val b = basis ()
 
@@ -260,7 +327,7 @@ fun requestDir dname =
        val (_, files) = Order.order (SOME b) files
 
        val _ = if !ErrorMsg.anyErrors then
-                   raise ErrorMsg.Error
+                   (print "J\n";raise ErrorMsg.Error)
                else
                    ()
 
@@ -294,7 +361,7 @@ fun requestDir dname =
 
 fun requestPing () =
     let
-       val (_, bio) = requestBio (fn () => ())
+       val (_, bio) = requestBio' false (fn () => ())
     in
        OpenSSL.close bio;
        OS.Process.success
@@ -307,7 +374,7 @@ fun requestShutdown () =
     in
        Msg.send (bio, MsgShutdown);
        case Msg.recv bio of
-           NONE => print "Server closed connection unexpectedly.\n"
+           NONE => ()
          | SOME m =>
            case m of
                MsgOk => print "Shutdown begun.\n"
@@ -318,7 +385,7 @@ fun requestShutdown () =
 
 fun requestSlavePing () =
     let
-       val (_, bio) = requestSlaveBio ()
+       val (_, bio) = requestSlaveBio' false
     in
        OpenSSL.close bio;
        OS.Process.success
@@ -331,7 +398,7 @@ fun requestSlaveShutdown () =
     in
        Msg.send (bio, MsgShutdown);
        case Msg.recv bio of
-           NONE => print "Server closed connection unexpectedly.\n"
+           NONE => ()
          | SOME m =>
            case m of
                MsgOk => print "Shutdown begun.\n"
@@ -421,6 +488,21 @@ fun requestRegen () =
        OpenSSL.close bio
     end
 
+fun requestRegenTc () =
+    let
+       val (_, bio) = requestBio (fn () => ())
+    in
+       Msg.send (bio, MsgRegenerateTc);
+       case Msg.recv bio of
+           NONE => print "Server closed connection unexpectedly.\n"
+         | SOME m =>
+           case m of
+               MsgOk => print "All configuration validated.\n"
+             | MsgError s => print ("Configuration validation failed: " ^ s ^ "\n")
+             | _ => print "Unexpected server reply.\n";
+       OpenSSL.close bio
+    end
+
 fun requestRmdom dom =
     let
        val (_, bio) = requestBio (fn () => ())
@@ -485,7 +567,7 @@ fun requestDbTable p =
     let
        val (user, bio) = requestBio (fn () => ())
     in
-       Msg.send (bio, MsgCreateDbTable p);
+       Msg.send (bio, MsgCreateDb p);
        case Msg.recv bio of
            NONE => print "Server closed connection unexpectedly.\n"
          | SOME m =>
@@ -496,6 +578,36 @@ fun requestDbTable p =
        OpenSSL.close bio
     end
 
+fun requestDbDrop p =
+    let
+       val (user, bio) = requestBio (fn () => ())
+    in
+       Msg.send (bio, MsgDropDb p);
+       case Msg.recv bio of
+           NONE => print "Server closed connection unexpectedly.\n"
+         | SOME m =>
+           case m of
+               MsgOk => print ("Your database " ^ user ^ "_" ^ #dbname p ^ " has been dropped.\n")
+             | MsgError s => print ("Drop failed: " ^ s ^ "\n")
+             | _ => print "Unexpected server reply.\n";
+       OpenSSL.close bio
+    end
+
+fun requestDbGrant p =
+    let
+       val (user, bio) = requestBio (fn () => ())
+    in
+       Msg.send (bio, MsgGrantDb p);
+       case Msg.recv bio of
+           NONE => print "Server closed connection unexpectedly.\n"
+         | SOME m =>
+           case m of
+               MsgOk => print ("You've been granted all allowed privileges to database " ^ user ^ "_" ^ #dbname p ^ ".\n")
+             | MsgError s => print ("Grant failed: " ^ s ^ "\n")
+             | _ => print "Unexpected server reply.\n";
+       OpenSSL.close bio
+    end
+
 fun requestListMailboxes domain =
     let
        val (_, bio) = requestBio (fn () => ())
@@ -507,7 +619,7 @@ fun requestListMailboxes domain =
             case m of
                 MsgMailboxes users => (Msg.send (bio, MsgOk);
                                        Vmail.Listing users)
-              | MsgError s => Vmail.Error ("Creation failed: " ^ s)
+              | MsgError s => Vmail.Error ("Listing failed: " ^ s)
               | _ => Vmail.Error "Unexpected server reply.")
        before OpenSSL.close bio
     end
@@ -611,13 +723,28 @@ fun requestSmtpLog domain =
        OpenSSL.close bio
     end
 
+fun requestMysqlFixperms () =
+    let
+       val (_, bio) = requestBio (fn () => ())
+    in
+       Msg.send (bio, MsgMysqlFixperms);
+       case Msg.recv bio of
+           NONE => print "Server closed connection unexpectedly.\n"
+         | SOME m =>
+           case m of
+               MsgOk => print "Permissions granted.\n"
+             | MsgError s => print ("Failed: " ^ s ^ "\n")
+             | _ => print "Unexpected server reply.\n";
+       OpenSSL.close bio
+    end
+
 fun requestApt {node, pkg} =
     let
        val (user, context) = requestContext (fn () => ())
-       val bio = OpenSSL.connect (context, if node = Config.masterNode then
-                                               dispatcher
-                                           else
-                                               Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+       val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+                                                    dispatcher
+                                                else
+                                                    Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
 
        val _ = Msg.send (bio, MsgQuery (QApt pkg))
 
@@ -643,10 +770,10 @@ fun requestApt {node, pkg} =
 fun requestCron {node, uname} =
     let
        val (user, context) = requestContext (fn () => ())
-       val bio = OpenSSL.connect (context, if node = Config.masterNode then
-                                               dispatcher
-                                           else
-                                               Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+       val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+                                                    dispatcher
+                                                else
+                                                    Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
 
        val _ = Msg.send (bio, MsgQuery (QCron uname))
 
@@ -672,10 +799,10 @@ fun requestCron {node, uname} =
 fun requestFtp {node, uname} =
     let
        val (user, context) = requestContext (fn () => ())
-       val bio = OpenSSL.connect (context, if node = Config.masterNode then
-                                               dispatcher
-                                           else
-                                               Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+       val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+                                                    dispatcher
+                                                else
+                                                    Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
 
        val _ = Msg.send (bio, MsgQuery (QFtp uname))
 
@@ -701,10 +828,10 @@ fun requestFtp {node, uname} =
 fun requestTrustedPath {node, uname} =
     let
        val (user, context) = requestContext (fn () => ())
-       val bio = OpenSSL.connect (context, if node = Config.masterNode then
-                                               dispatcher
-                                           else
-                                               Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+       val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+                                                    dispatcher
+                                                else
+                                                    Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
 
        val _ = Msg.send (bio, MsgQuery (QTrustedPath uname))
 
@@ -730,10 +857,10 @@ fun requestTrustedPath {node, uname} =
 fun requestSocketPerm {node, uname} =
     let
        val (user, context) = requestContext (fn () => ())
-       val bio = OpenSSL.connect (context, if node = Config.masterNode then
-                                               dispatcher
-                                           else
-                                               Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+       val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+                                                    dispatcher
+                                                else
+                                                    Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
 
        val _ = Msg.send (bio, MsgQuery (QSocket uname))
 
@@ -761,11 +888,11 @@ fun requestSocketPerm {node, uname} =
 fun requestFirewall {node, uname} =
     let
        val (user, context) = requestContext (fn () => ())
-       val bio = OpenSSL.connect (context, if node = Config.masterNode then
-                                               dispatcher
-                                           else
-                                               Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
-
+       val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+                                                    dispatcher
+                                                else
+                                                    Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+                 
        val _ = Msg.send (bio, MsgQuery (QFirewall uname))
 
        fun loop () =
@@ -785,21 +912,107 @@ fun requestFirewall {node, uname} =
        before OpenSSL.close bio
     end
 
-fun regenerate context =
+fun requestDescribe dom =
+    let
+       val (_, bio) = requestBio (fn () => ())
+    in
+       Msg.send (bio, MsgDescribe dom);
+       case Msg.recv bio of
+           NONE => print "Server closed connection unexpectedly.\n"
+         | SOME m =>
+           case m of
+               MsgDescription s => print s
+             | MsgError s => print ("Description failed: " ^ s ^ "\n")
+             | _ => print "Unexpected server reply.\n";
+       OpenSSL.close bio
+    end
+
+structure SS = StringSet
+
+fun domainList dname =
     let
+       val dir = Posix.FileSys.opendir dname
+
+       fun visitNode dset =
+           case Posix.FileSys.readdir dir of
+               NONE => dset
+             | SOME node =>
+               let
+                   val path = OS.Path.joinDirFile {dir = dname,
+                                                   file = node}
+
+                   fun visitDomains (path, bfor, dset) =
+                       let
+                           val dir = Posix.FileSys.opendir path
+
+                           fun loop dset =
+                               case Posix.FileSys.readdir dir of
+                                   NONE => dset
+                                 | SOME dname =>
+                                   let
+                                       val path = OS.Path.joinDirFile {dir = path,
+                                                                       file = dname}
+                                   in
+                                       if Posix.FileSys.ST.isDir (Posix.FileSys.stat path) then
+                                           let
+                                               val bfor = dname :: bfor
+                                           in
+                                               loop (visitDomains (path, bfor,
+                                                                   SS.add (dset,
+                                                                           String.concatWith "." bfor)))
+                                           end
+                                       else
+                                           loop dset
+                                   end
+                       in
+                           loop dset
+                           before Posix.FileSys.closedir dir
+                       end
+               in
+                   visitNode (visitDomains (path, [], dset))
+               end
+    in
+       visitNode SS.empty
+       before Posix.FileSys.closedir dir
+    end
+
+fun regenerateEither tc checker context =
+    let
+       val () = print "Starting regeneration....\n"
+
+       val domainsBefore =
+           if tc then
+               SS.empty
+           else
+               domainList Config.resultRoot
+
+       fun ifReal f =
+           if tc then
+               ()
+           else
+               f ()
+
+       val _ = ErrorMsg.reset ()
+
        val b = basis ()
        val () = Tycheck.disallowExterns ()
 
-       val () = Domain.resetGlobal ()
+       val () = ifReal (fn () =>
+                           (ignore (OS.Process.system ("rm -rf " ^ Config.oldResultRoot ^ "/*"));
+                            ignore (OS.Process.system ("cp -r " ^ Config.resultRoot
+                                                       ^ "/* " ^ Config.oldResultRoot ^ "/"));
+                            Domain.resetGlobal ()))
 
+       val ok = ref true
        fun contactNode (node, ip) =
            if node = Config.defaultNode then
                Domain.resetLocal ()
            else let
-                   val bio = OpenSSL.connect (context,
-                                              ip
-                                              ^ ":"
-                                              ^ Int.toString Config.slavePort)
+                   val bio = OpenSSL.connect true (context,
+                                                   ip
+                                                   ^ ":"
+                                                   ^ Int.toString Config.slavePort)
                in
                    Msg.send (bio, MsgRegenerate);
                    case Msg.recv bio of
@@ -813,7 +1026,8 @@ fun regenerate context =
                          | _ => print ("Slave " ^ node
                                        ^ " returned unexpected command\n");
                    OpenSSL.close bio
-               end             
+               end
+                handle OpenSSL.OpenSSL s => print ("OpenSSL error: " ^ s ^ "\n")
 
        fun doUser user =
            let
@@ -821,40 +1035,81 @@ fun regenerate context =
                val _ = ErrorMsg.reset ()
 
                val dname = Config.domtoolDir user
+           in
+               if Posix.FileSys.access (dname, []) then
+                   let
+                       val dir = Posix.FileSys.opendir dname
+
+                       fun loop files =
+                           case Posix.FileSys.readdir dir of
+                               NONE => (Posix.FileSys.closedir dir;
+                                        files)
+                             | SOME fname =>
+                               if notTmp fname then
+                                   loop (OS.Path.joinDirFile {dir = dname,
+                                                              file = fname}
+                                         :: files)
+                               else
+                                   loop files
 
-               val dir = Posix.FileSys.opendir dname
-
-               fun loop files =
-                   case Posix.FileSys.readdir dir of
-                       NONE => (Posix.FileSys.closedir dir;
-                                files)
-                     | SOME fname =>
-                       if notTmp fname then
-                           loop (OS.Path.joinDirFile {dir = dname,
-                                                      file = fname}
-                                 :: files)
-                       else
-                           loop files
+                       val files = loop []
+                       val (_, files) = Order.order (SOME b) files
 
-               val files = loop []
-               val (_, files) = Order.order (SOME b) files
-           in
-               if !ErrorMsg.anyErrors then
-                   print ("User " ^ user ^ "'s configuration has errors!\n")
+                       fun checker' (file, (G, evs)) =
+                           checker G evs file
+                   in
+                       if !ErrorMsg.anyErrors then
+                           (ErrorMsg.reset ();
+                            print ("User " ^ user ^ "'s configuration has errors!\n");
+                            ok := false)
+                       else
+                           ();
+                       ignore (foldl checker' (basis (), Defaults.eInit ()) files)
+                   end
+               else if String.isSuffix "_admin" user then
+                   ()    
                else
-                   app eval' files
+                   (print ("Couldn't access " ^ user ^ "'s ~/.domtool directory.\n");
+                    ok := false)
            end
-               handle IO.Io _ => ()
-                    | OS.SysErr (s, _) => print ("System error processing user " ^ user ^ ": " ^ s ^ "\n")
-                    | ErrorMsg.Error => print ("User " ^ user ^ " had a compilation error.\n")
-                    | _ => print "Unknown exception during regeneration!\n"
+           handle IO.Io {name, function, ...} =>
+                  (print ("IO error processing user " ^ user ^ ": " ^ function ^ ": " ^ name ^ "\n");
+                   ok := false)
+                | exn as OS.SysErr (s, _) => (print ("System error processing user " ^ user ^ ": " ^ s ^ "\n");
+                                              ok := false)
+                | ErrorMsg.Error => (ErrorMsg.reset ();
+                                     print ("User " ^ user ^ " had a compilation error.\n");
+                                     ok := false)
+                | _ => (print "Unknown exception during regeneration!\n";
+                        ok := false)
     in
-       app contactNode Config.nodeIps;
-       Env.pre ();
+       ifReal (fn () => (app contactNode Config.nodeIps;
+                         Env.pre ()));
        app doUser (Acl.users ());
-       Env.post ()
+       ifReal (fn () =>
+                  let
+                      val domainsAfter = domainList Config.resultRoot
+                      val domainsGone = SS.difference (domainsBefore, domainsAfter)
+                  in
+                      if SS.isEmpty domainsGone then
+                          ()
+                      else
+                          (print "Domains to kill:";
+                           SS.app (fn s => (print " "; print s)) domainsGone;
+                           print "\n";
+
+                           Domain.rmdom' Config.oldResultRoot (SS.listItems domainsGone));
+                      
+                      Env.post ()
+                  end);
+       !ok
     end
 
+val regenerate = regenerateEither false eval
+val regenerateTc = regenerateEither true
+                                   (fn G => fn evs => fn file =>
+                                                         (#1 (check G file), evs))
+
 fun rmuser user =
     let
        val doms = Acl.class {user = user, class = "domain"}
@@ -889,382 +1144,490 @@ fun describeQuery q =
 
 fun service () =
     let
+       val host = Slave.hostname ()
+
        val () = Acl.read Config.aclFile
-       
-       val context = OpenSSL.context (Config.serverCert,
-                                      Config.serverKey,
-                                      Config.trustStore)
+
+       val context = context (Config.certDir ^ "/" ^ host ^ ".pem",
+                              Config.keyDir ^ "/" ^ host ^ "/key.pem",
+                              Config.trustStore)
        val _ = Domain.set_context context
 
        val sock = OpenSSL.listen (context, Config.dispatcherPort)
 
        fun loop () =
-           case OpenSSL.accept sock of
-               NONE => ()
-             | SOME bio =>
-               let
-                   val user = OpenSSL.peerCN bio
-                   val () = print ("\nConnection from " ^ user ^ " at " ^ now () ^ "\n")
-                   val () = Domain.setUser user
-
-                   fun doIt f cleanup =
-                       ((case f () of
-                            (msgLocal, SOME msgRemote) => 
-                            (print msgLocal;
-                             print "\n";
-                             Msg.send (bio, MsgError msgRemote))
-                          | (msgLocal, NONE) =>
-                            (print msgLocal;
-                             print "\n";
-                             Msg.send (bio, MsgOk)))
-                        handle OpenSSL.OpenSSL _ =>
-                               print "OpenSSL error\n"
-                             | OS.SysErr (s, _) =>
-                               (print "System error: ";
-                                print s;
-                                print "\n";
-                                Msg.send (bio, MsgError ("System error: " ^ s))
-                                handle OpenSSL.OpenSSL _ => ())
-                             | Fail s =>
-                               (print "Failure: ";
-                                print s;
-                                print "\n";
-                                Msg.send (bio, MsgError ("Failure: " ^ s))
-                                handle OpenSSL.OpenSSL _ => ())
-                             | ErrorMsg.Error =>
-                               (print "Compilation error\n";
-                                Msg.send (bio, MsgError "Error during configuration evaluation")
-                                handle OpenSSL.OpenSSL _ => ());
-                         (cleanup ();
-                         ignore (OpenSSL.readChar bio);
-                         OpenSSL.close bio)
+           (case OpenSSL.accept sock of
+                NONE => ()
+              | SOME bio =>
+                let
+                    val user = OpenSSL.peerCN bio
+                    val () = print ("\nConnection from " ^ user ^ " at " ^ now () ^ "\n")
+                    val () = Domain.setUser user
+
+                    fun doIt f cleanup =
+                        ((case f () of
+                              (msgLocal, SOME msgRemote) => 
+                              (print msgLocal;
+                               print "\n";
+                               Msg.send (bio, MsgError msgRemote))
+                            | (msgLocal, NONE) =>
+                              (print msgLocal;
+                               print "\n";
+                               Msg.send (bio, MsgOk)))
+                         handle e as (OpenSSL.OpenSSL s) =>
+                                (print ("OpenSSL error: " ^ s ^ "\n");
+                                 app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e);
+                                 Msg.send (bio, MsgError ("OpenSSL error: " ^ s))
+                                 handle OpenSSL.OpenSSL _ => ())
+                              | OS.SysErr (s, _) =>
+                                (print "System error: ";
+                                 print s;
+                                 print "\n";
+                                 Msg.send (bio, MsgError ("System error: " ^ s))
+                                 handle OpenSSL.OpenSSL _ => ())
+                              | Fail s =>
+                                (print "Failure: ";
+                                 print s;
+                                 print "\n";
+                                 Msg.send (bio, MsgError ("Failure: " ^ s))
+                                 handle OpenSSL.OpenSSL _ => ())
+                              | ErrorMsg.Error =>
+                                (print "Compilation error\n";
+                                 Msg.send (bio, MsgError "Error during configuration evaluation")
+                                 handle OpenSSL.OpenSSL _ => ());
+                          (cleanup ();
+                          ignore (OpenSSL.readChar bio);
+                          OpenSSL.close bio)
+                         handle OpenSSL.OpenSSL _ => ();
+                         loop ())
+
+                    fun doConfig codes =
+                        let
+                            val _ = print "Configuration:\n"
+                            val _ = app (fn s => (print s; print "\n")) codes
+                            val _ = print "\n"
+
+                            val outname = OS.FileSys.tmpName ()
+
+                            fun doOne (code, (G, evs)) =
+                                let
+                                    val outf = TextIO.openOut outname
+                                in
+                                    TextIO.output (outf, code);
+                                    TextIO.closeOut outf;
+                                    eval G evs outname
+                                end
+                        in
+                            doIt (fn () => (Env.pre ();
+                                            ignore (foldl doOne (basis (), Defaults.eInit ()) codes);
+                                            Env.post ();
+                                            Msg.send (bio, MsgOk);
+                                            ("Configuration complete.", NONE)))
+                                 (fn () => OS.FileSys.remove outname)
+                        end
+
+                    fun checkAddr s =
+                        case String.fields (fn ch => ch = #"@") s of
+                            [user'] =>
+                            if user = user' then
+                                SOME (SetSA.User s)
+                            else
+                                NONE
+                          | [user', domain] =>
+                            if Domain.validEmailUser user' andalso Domain.yourDomain domain then
+                                SOME (SetSA.Email s)
+                            else
+                                NONE
+                          | _ => NONE
+
+                    fun cmdLoop () =
+                        case Msg.recv bio of
+                            NONE => (OpenSSL.close bio
+                                     handle OpenSSL.OpenSSL _ => ();
+                                     loop ())
+                          | SOME m =>
+                            case m of
+                                MsgConfig code => doConfig [code]
+                              | MsgMultiConfig codes => doConfig codes
+
+                              | MsgShutdown =>
+                                if Acl.query {user = user, class = "priv", value = "all"}
+                                   orelse Acl.query {user = user, class = "priv", value = "shutdown"} then
+                                    print ("Domtool dispatcher shutting down at " ^ now () ^ "\n\n")
+                                else
+                                    (print "Unauthorized shutdown command!\n";
+                                     OpenSSL.close bio
+                                     handle OpenSSL.OpenSSL _ => ();
+                                     loop ())
+
+                              | MsgGrant acl =>
+                                doIt (fn () =>
+                                         if Acl.query {user = user, class = "priv", value = "all"} then
+                                             (Acl.grant acl;
+                                              Acl.write Config.aclFile;
+                                              ("Granted permission " ^ #value acl ^ " to " ^ #user acl ^ " in " ^ #class acl ^ ".",
+                                               NONE))
+                                         else
+                                             ("Unauthorized user asked to grant a permission!",
+                                              SOME "Not authorized to grant privileges"))
+                                     (fn () => ())
+                                
+                              | MsgRevoke acl =>
+                                doIt (fn () =>
+                                         if Acl.query {user = user, class = "priv", value = "all"} then
+                                             (Acl.revoke acl;
+                                              Acl.write Config.aclFile;
+                                              ("Revoked permission " ^ #value acl ^ " from " ^ #user acl ^ " in " ^ #class acl ^ ".",
+                                               NONE))
+                                         else
+                                             ("Unauthorized user asked to revoke a permission!",
+                                              SOME "Not authorized to revoke privileges"))
+                                     (fn () => ())
+
+                              | MsgListPerms user =>
+                                doIt (fn () =>
+                                         (Msg.send (bio, MsgPerms (Acl.queryAll user));
+                                          ("Sent permission list for user " ^ user ^ ".",
+                                           NONE)))
+                                     (fn () => ())
+
+                              | MsgWhoHas perm =>
+                                doIt (fn () =>
+                                         (Msg.send (bio, MsgWhoHasResponse (Acl.whoHas perm));
+                                          ("Sent whohas response for " ^ #class perm ^ " / " ^ #value perm ^ ".",
+                                           NONE)))
+                                     (fn () => ())
+
+                              | MsgRmdom doms =>
+                                doIt (fn () =>
+                                         if Acl.query {user = user, class = "priv", value = "all"}
+                                            orelse List.all (fn dom => Domain.validDomain dom
+                                                                       andalso Acl.queryDomain {user = user, domain = dom}) doms then
+                                             (Domain.rmdom doms;
+                                              (*app (fn dom =>
+                                                      Acl.revokeFromAll {class = "domain", value = dom}) doms;
+                                              Acl.write Config.aclFile;*)
+                                              ("Removed domains" ^ foldl (fn (d, s) => s ^ " " ^ d) "" doms ^ ".",
+                                               NONE))
+                                         else
+                                             ("Unauthorized user asked to remove a domain!",
+                                              SOME "Not authorized to remove that domain"))
+                                     (fn () => ())
+
+                              | MsgRegenerate =>
+                                doIt (fn () =>
+                                         if Acl.query {user = user, class = "priv", value = "regen"}
+                                            orelse Acl.query {user = user, class = "priv", value = "all"} then
+                                             (if regenerate context then
+                                                  ("Regenerated all configuration.",
+                                                   NONE)
+                                              else
+                                                  ("Error regenerating configuration!",
+                                                   SOME "Error regenerating configuration!  Consult /var/log/domtool.log."))
+                                         else
+                                             ("Unauthorized user asked to regenerate!",
+                                              SOME "Not authorized to regenerate"))
+                                     (fn () => ())
+
+                              | MsgRegenerateTc =>
+                                doIt (fn () =>
+                                         if Acl.query {user = user, class = "priv", value = "regen"}
+                                            orelse Acl.query {user = user, class = "priv", value = "all"} then
+                                             (if regenerateTc context then
+                                                  ("Checked all configuration.",
+                                                   NONE)
+                                              else
+                                                  ("Found a compilation error!",
+                                                   SOME "Found a compilation error!  Consult /var/log/domtool.log."))
+                                         else
+                                             ("Unauthorized user asked to regenerate -tc!",
+                                              SOME "Not authorized to regenerate -tc"))
+                                     (fn () => ())
+
+                              | MsgRmuser user' =>
+                                doIt (fn () =>
+                                         if Acl.query {user = user, class = "priv", value = "all"} then
+                                             (rmuser user';
+                                              Acl.write Config.aclFile;
+                                              ("Removed user " ^ user' ^ ".",
+                                               NONE))
+                                         else
+                                             ("Unauthorized user asked to remove a user!",
+                                              SOME "Not authorized to remove users"))
+                                     (fn () => ())
+
+                              | MsgCreateDbUser {dbtype, passwd} =>
+                                doIt (fn () =>
+                                         case Dbms.lookup dbtype of
+                                             NONE => ("Database user creation request with unknown datatype type " ^ dbtype,
+                                                      SOME ("Unknown database type " ^ dbtype))
+                                           | SOME handler =>
+                                             case #adduser handler {user = user, passwd = passwd} of
+                                                 NONE => ("Added " ^ dbtype ^ " user " ^ user ^ ".",
+                                                          NONE)
+                                               | SOME msg =>
+                                                 ("Error adding a " ^ dbtype ^ " user " ^ user ^ ": " ^ msg,
+                                                  SOME ("Error adding user: " ^ msg)))
+                                     (fn () => ())
+
+                              | MsgDbPasswd {dbtype, passwd} =>
+                                doIt (fn () =>
+                                         case Dbms.lookup dbtype of
+                                             NONE => ("Database passwd request with unknown datatype type " ^ dbtype,
+                                                      SOME ("Unknown database type " ^ dbtype))
+                                           | SOME handler =>
+                                             case #passwd handler {user = user, passwd = passwd} of
+                                                 NONE => ("Changed " ^ dbtype ^ " password of user " ^ user ^ ".",
+                                                          NONE)
+                                               | SOME msg =>
+                                                 ("Error setting " ^ dbtype ^ " password of user " ^ user ^ ": " ^ msg,
+                                                  SOME ("Error adding user: " ^ msg)))
+                                     (fn () => ())
+
+                              | MsgCreateDb {dbtype, dbname, encoding} =>
+                                doIt (fn () =>
+                                         if Dbms.validDbname dbname then
+                                             case Dbms.lookup dbtype of
+                                                 NONE => ("Database creation request with unknown datatype type " ^ dbtype,
+                                                          SOME ("Unknown database type " ^ dbtype))
+                                               | SOME handler =>
+                                                 if not (Dbms.validEncoding encoding) then
+                                                     ("Invalid encoding " ^ valOf encoding ^ " requested for database creation.",
+                                                      SOME "Invalid encoding")
+                                                 else
+                                                     case #createdb handler {user = user, dbname = dbname, encoding = encoding} of
+                                                         NONE => ("Created database " ^ user ^ "_" ^ dbname ^ ".",
+                                                                  NONE)
+                                                       | SOME msg => ("Error creating database " ^ user ^ "_" ^ dbname ^ ": " ^ msg,
+                                                                      SOME ("Error creating database: " ^ msg))
+                                         else
+                                             ("Invalid database name " ^ user ^ "_" ^ dbname,
+                                              SOME ("Invalid database name " ^ dbname)))
+                                     (fn () => ())
+
+                              | MsgDropDb {dbtype, dbname} =>
+                                doIt (fn () =>
+                                         if Dbms.validDbname dbname then
+                                             case Dbms.lookup dbtype of
+                                                 NONE => ("Database drop request with unknown datatype type " ^ dbtype,
+                                                          SOME ("Unknown database type " ^ dbtype))
+                                               | SOME handler =>
+                                                 case #dropdb handler {user = user, dbname = dbname} of
+                                                     NONE => ("Drop database " ^ user ^ "_" ^ dbname ^ ".",
+                                                              NONE)
+                                                   | SOME msg => ("Error dropping database " ^ user ^ "_" ^ dbname ^ ": " ^ msg,
+                                                                  SOME ("Error dropping database: " ^ msg))
+                                         else
+                                             ("Invalid database name " ^ user ^ "_" ^ dbname,
+                                              SOME ("Invalid database name " ^ dbname)))
+                                     (fn () => ())
+
+                              | MsgGrantDb {dbtype, dbname} =>
+                                doIt (fn () =>
+                                         if Dbms.validDbname dbname then
+                                             case Dbms.lookup dbtype of
+                                                 NONE => ("Database drop request with unknown datatype type " ^ dbtype,
+                                                          SOME ("Unknown database type " ^ dbtype))
+                                               | SOME handler =>
+                                                 case #grant handler {user = user, dbname = dbname} of
+                                                     NONE => ("Grant permissions to database " ^ user ^ "_" ^ dbname ^ ".",
+                                                              NONE)
+                                                   | SOME msg => ("Error granting permissions to database " ^ user ^ "_" ^ dbname ^ ": " ^ msg,
+                                                                  SOME ("Error granting permissions to database: " ^ msg))
+                                         else
+                                             ("Invalid database name " ^ user ^ "_" ^ dbname,
+                                              SOME ("Invalid database name " ^ dbname)))
+                                     (fn () => ())
+
+                              | MsgListMailboxes domain =>
+                                doIt (fn () =>
+                                         if not (Domain.yourDomain domain) then
+                                             ("User wasn't authorized to list mailboxes for " ^ domain,
+                                              SOME "You're not authorized to configure that domain.")
+                                         else
+                                             case Vmail.list domain of
+                                                 Vmail.Listing users => (Msg.send (bio, MsgMailboxes users);
+                                                                         ("Sent mailbox list for " ^ domain,
+                                                                          NONE))
+                                               | Vmail.Error msg => ("Error listing mailboxes for " ^ domain ^ ": " ^ msg,
+                                                                     SOME msg))
+                                     (fn () => ())
+
+                              | MsgNewMailbox {domain, user = emailUser, passwd, mailbox} =>
+                                doIt (fn () =>
+                                         if not (Domain.yourDomain domain) then
+                                             ("User wasn't authorized to add a mailbox to " ^ domain,
+                                              SOME "You're not authorized to configure that domain.")
+                                         else if not (Domain.validEmailUser emailUser) then
+                                             ("Invalid e-mail username " ^ emailUser,
+                                              SOME "Invalid e-mail username")
+                                         else if not (CharVector.all Char.isGraph passwd) then
+                                             ("Invalid password",
+                                              SOME "Invalid password; may only contain printable, non-space characters")
+                                         else if not (Domain.yourPath mailbox) then
+                                             ("User wasn't authorized to add a mailbox at " ^ mailbox,
+                                              SOME ("You're not authorized to use that mailbox location. ("
+                                                    ^ mailbox ^ ")"))
+                                         else
+                                             case Vmail.add {requester = user,
+                                                             domain = domain, user = emailUser,
+                                                             passwd = passwd, mailbox = mailbox} of
+                                                 NONE => ("Added mailbox " ^ emailUser ^ "@" ^ domain ^ " at " ^ mailbox,
+                                                          NONE)
+                                               | SOME msg => ("Error adding mailbox " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
+                                                              SOME msg))
+                                     (fn () => ())
+                                
+                              | MsgPasswdMailbox {domain, user = emailUser, passwd} =>
+                                doIt (fn () =>
+                                         if not (Domain.yourDomain domain) then
+                                             ("User wasn't authorized to change password of a mailbox for " ^ domain,
+                                              SOME "You're not authorized to configure that domain.")
+                                         else if not (Domain.validEmailUser emailUser) then
+                                             ("Invalid e-mail username " ^ emailUser,
+                                              SOME "Invalid e-mail username")
+                                         else if not (CharVector.all Char.isGraph passwd) then
+                                             ("Invalid password",
+                                              SOME "Invalid password; may only contain printable, non-space characters")
+                                         else
+                                             case Vmail.passwd {domain = domain, user = emailUser,
+                                                                passwd = passwd} of
+                                                 NONE => ("Changed password of mailbox " ^ emailUser ^ "@" ^ domain,
+                                                          NONE)
+                                               | SOME msg => ("Error changing mailbox password for " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
+                                                              SOME msg))
+                                     (fn () => ())
+
+                              | MsgRmMailbox {domain, user = emailUser} =>
+                                doIt (fn () =>
+                                         if not (Domain.yourDomain domain) then
+                                             ("User wasn't authorized to change password of a mailbox for " ^ domain,
+                                              SOME "You're not authorized to configure that domain.")
+                                         else if not (Domain.validEmailUser emailUser) then
+                                             ("Invalid e-mail username " ^ emailUser,
+                                              SOME "Invalid e-mail username")
+                                         else
+                                             case Vmail.rm {domain = domain, user = emailUser} of
+                                                 NONE => ("Deleted mailbox " ^ emailUser ^ "@" ^ domain,
+                                                          NONE)
+                                               | SOME msg => ("Error deleting mailbox " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
+                                                              SOME msg))
+                                     (fn () => ())
+
+                              | MsgSaQuery addr =>
+                                doIt (fn () =>
+                                         case checkAddr addr of
+                                             NONE => ("User tried to query SA filtering for " ^ addr,
+                                                      SOME "You aren't allowed to configure SA filtering for that recipient.")
+                                           | SOME addr' => (Msg.send (bio, MsgSaStatus (SetSA.query addr'));
+                                                            ("Queried SA filtering status for " ^ addr,
+                                                             NONE)))
+                                     (fn () => ())
+
+                              | MsgSaSet (addr, b) =>
+                                doIt (fn () =>
+                                         case checkAddr addr of
+                                             NONE => ("User tried to set SA filtering for " ^ addr,
+                                                      SOME "You aren't allowed to configure SA filtering for that recipient.")
+                                           | SOME addr' => (SetSA.set (addr', b);
+                                                            Msg.send (bio, MsgOk);
+                                                            ("Set SA filtering status for " ^ addr ^ " to "
+                                                             ^ (if b then "ON" else "OFF"),
+                                                             NONE)))
+                                     (fn () => ())
+
+                              | MsgSmtpLogReq domain =>
+                                doIt (fn () =>
+                                         if not (Domain.yourDomain domain) then
+                                             ("Unauthorized user tried to request SMTP logs for " ^ domain,
+                                              SOME "You aren't authorized to configure that domain.")
+                                         else
+                                             (SmtpLog.search (fn line => Msg.send (bio, MsgSmtpLogRes line))
+                                                             domain;
+                                              ("Requested SMTP logs for " ^ domain,
+                                               NONE)))
+                                     (fn () => ())
+
+                              | MsgQuery q =>
+                                doIt (fn () => (Msg.send (bio, answerQuery q);
+                                                (describeQuery q,
+                                                 NONE)))
+                                     (fn () => ())
+
+                              | MsgMysqlFixperms =>
+                                doIt (fn () => if OS.Process.isSuccess
+                                                      (OS.Process.system "/usr/bin/sudo -H /afs/hcoop.net/common/etc/scripts/mysql-grant-table-drop") then
+                                                   ("Requested mysql-fixperms",
+                                                    NONE)
+                                                else
+                                                    ("Requested mysql-fixperms, but execution failed!",
+                                                     SOME "Script execution failed."))
+                                     (fn () => ())
+
+                              | MsgDescribe dom =>
+                                doIt (fn () => if not (Domain.validDomain dom) then
+                                                   ("Requested description of invalid domain " ^ dom,
+                                                    SOME "Invalid domain name")
+                                               else if not (Domain.yourDomain dom
+                                                            orelse Acl.query {user = user, class = "priv", value = "all"}) then
+                                                   ("Requested description of " ^ dom ^ ", but not allowed access",
+                                                    SOME "Access denied")
+                                               else
+                                                   (Msg.send (bio, MsgDescription (Domain.describe dom));
+                                                    ("Sent description of domain " ^ dom,
+                                                     NONE)))
+                                     (fn () => ())
+
+                              | _ =>
+                                doIt (fn () => ("Unexpected command",
+                                                SOME "Unexpected command"))
+                                     (fn () => ())
+                in
+                    cmdLoop ()
+                end
+                handle e as (OpenSSL.OpenSSL s) =>
+                       (print ("OpenSSL error: " ^ s ^ "\n");
+                        app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e);
+                        OpenSSL.close bio
                         handle OpenSSL.OpenSSL _ => ();
                         loop ())
-
-                   fun doConfig codes =
-                       let
-                           val _ = print "Configuration:\n"
-                           val _ = app (fn s => (print s; print "\n")) codes
-                           val _ = print "\n"
-
-                           val outname = OS.FileSys.tmpName ()
-
-                           fun doOne code =
-                               let
-                                   val outf = TextIO.openOut outname
-                               in
-                                   TextIO.output (outf, code);
-                                   TextIO.closeOut outf;
-                                   eval' outname
-                               end
-                       in
-                           doIt (fn () => (Env.pre ();
-                                           app doOne codes;
-                                           Env.post ();
-                                           Msg.send (bio, MsgOk);
-                                           ("Configuration complete.", NONE)))
-                                (fn () => OS.FileSys.remove outname)
-                       end
-
-                   fun checkAddr s =
-                       case String.fields (fn ch => ch = #"@") s of
-                           [user'] =>
-                           if user = user' then
-                               SOME (SetSA.User s)
-                           else
-                               NONE
-                         | [user', domain] =>
-                           if Domain.validEmailUser user' andalso Domain.yourDomain domain then
-                               SOME (SetSA.Email s)
-                           else
-                               NONE
-                         | _ => NONE
-
-                   fun cmdLoop () =
-                       case Msg.recv bio of
-                           NONE => (OpenSSL.close bio
-                                    handle OpenSSL.OpenSSL _ => ();
-                                    loop ())
-                         | SOME m =>
-                           case m of
-                               MsgConfig code => doConfig [code]
-                             | MsgMultiConfig codes => doConfig codes
-
-                             | MsgShutdown =>
-                               if Acl.query {user = user, class = "priv", value = "all"}
-                                  orelse Acl.query {user = user, class = "priv", value = "shutdown"} then
-                                   print ("Domtool dispatcher shutting down at " ^ now () ^ "\n\n")
-                               else
-                                   (print "Unauthorized shutdown command!\n";
-                                    OpenSSL.close bio
-                                    handle OpenSSL.OpenSSL _ => ();
-                                    loop ())
-
-                             | MsgGrant acl =>
-                               doIt (fn () =>
-                                        if Acl.query {user = user, class = "priv", value = "all"} then
-                                            (Acl.grant acl;
-                                             Acl.write Config.aclFile;
-                                             ("Granted permission " ^ #value acl ^ " to " ^ #user acl ^ " in " ^ #class acl ^ ".",
-                                              NONE))
-                                        else
-                                            ("Unauthorized user asked to grant a permission!",
-                                             SOME "Not authorized to grant privileges"))
-                                    (fn () => ())
-                                                        
-                             | MsgRevoke acl =>
-                               doIt (fn () =>
-                                        if Acl.query {user = user, class = "priv", value = "all"} then
-                                            (Acl.revoke acl;
-                                             Acl.write Config.aclFile;
-                                             ("Revoked permission " ^ #value acl ^ " from " ^ #user acl ^ " in " ^ #class acl ^ ".",
-                                              NONE))
-                                        else
-                                            ("Unauthorized user asked to revoke a permission!",
-                                             SOME "Not authorized to revoke privileges"))
-                                    (fn () => ())
-
-                             | MsgListPerms user =>
-                               doIt (fn () =>
-                                        (Msg.send (bio, MsgPerms (Acl.queryAll user));
-                                         ("Sent permission list for user " ^ user ^ ".",
-                                          NONE)))
-                                    (fn () => ())
-
-                             | MsgWhoHas perm =>
-                               doIt (fn () =>
-                                        (Msg.send (bio, MsgWhoHasResponse (Acl.whoHas perm));
-                                         ("Sent whohas response for " ^ #class perm ^ " / " ^ #value perm ^ ".",
-                                          NONE)))
-                                    (fn () => ())
-
-                             | MsgRmdom doms =>
-                               doIt (fn () =>
-                                        if Acl.query {user = user, class = "priv", value = "all"}
-                                           orelse List.all (fn dom => Acl.query {user = user, class = "domain", value = dom}) doms then
-                                            (Domain.rmdom doms;
-                                             app (fn dom =>
-                                                     Acl.revokeFromAll {class = "domain", value = dom}) doms;
-                                             Acl.write Config.aclFile;
-                                             ("Removed domains" ^ foldl (fn (d, s) => s ^ " " ^ d) "" doms ^ ".",
-                                              NONE))
-                                        else
-                                            ("Unauthorized user asked to remove a domain!",
-                                             SOME "Not authorized to remove that domain"))
-                                    (fn () => ())
-
-                             | MsgRegenerate =>
-                               doIt (fn () =>
-                                        if Acl.query {user = user, class = "priv", value = "regen"}
-                                           orelse Acl.query {user = user, class = "priv", value = "all"} then
-                                            (regenerate context;
-                                             ("Regenerated all configuration.",
-                                              NONE))
-                                        else
-                                            ("Unauthorized user asked to regenerate!",
-                                             SOME "Not authorized to regenerate"))
-                                    (fn () => ())
-
-                             | MsgRmuser user' =>
-                               doIt (fn () =>
-                                        if Acl.query {user = user, class = "priv", value = "all"} then
-                                            (rmuser user';
-                                             Acl.write Config.aclFile;
-                                             ("Removed user " ^ user' ^ ".",
-                                              NONE))
-                                        else
-                                            ("Unauthorized user asked to remove a user!",
-                                             SOME "Not authorized to remove users"))
-                                    (fn () => ())
-
-                             | MsgCreateDbUser {dbtype, passwd} =>
-                               doIt (fn () =>
-                                        case Dbms.lookup dbtype of
-                                            NONE => ("Database user creation request with unknown datatype type " ^ dbtype,
-                                                     SOME ("Unknown database type " ^ dbtype))
-                                          | SOME handler =>
-                                            case #adduser handler {user = user, passwd = passwd} of
-                                                NONE => ("Added " ^ dbtype ^ " user " ^ user ^ ".",
-                                                         NONE)
-                                              | SOME msg =>
-                                                ("Error adding a " ^ dbtype ^ " user " ^ user ^ ": " ^ msg,
-                                                 SOME ("Error adding user: " ^ msg)))
-                                    (fn () => ())
-
-                             | MsgDbPasswd {dbtype, passwd} =>
-                               doIt (fn () =>
-                                        case Dbms.lookup dbtype of
-                                            NONE => ("Database passwd request with unknown datatype type " ^ dbtype,
-                                                     SOME ("Unknown database type " ^ dbtype))
-                                          | SOME handler =>
-                                            case #passwd handler {user = user, passwd = passwd} of
-                                                NONE => ("Changed " ^ dbtype ^ " password of user " ^ user ^ ".",
-                                                         NONE)
-                                              | SOME msg =>
-                                                ("Error setting " ^ dbtype ^ " password of user " ^ user ^ ": " ^ msg,
-                                                 SOME ("Error adding user: " ^ msg)))
-                                    (fn () => ())
-
-                             | MsgCreateDbTable {dbtype, dbname} =>
-                               doIt (fn () =>
-                                        if Dbms.validDbname dbname then
-                                            case Dbms.lookup dbtype of
-                                                NONE => ("Database creation request with unknown datatype type " ^ dbtype,
-                                                         SOME ("Unknown database type " ^ dbtype))
-                                              | SOME handler =>
-                                                case #createdb handler {user = user, dbname = dbname} of
-                                                    NONE => ("Created database " ^ user ^ "_" ^ dbname ^ ".",
-                                                             NONE)
-                                                  | SOME msg => ("Error creating database " ^ user ^ "_" ^ dbname ^ ": " ^ msg,
-                                                                 SOME ("Error creating database: " ^ msg))
-                                        else
-                                            ("Invalid database name " ^ user ^ "_" ^ dbname,
-                                             SOME ("Invalid database name " ^ dbname)))
-                                    (fn () => ())
-
-                             | MsgListMailboxes domain =>
-                               doIt (fn () =>
-                                        if not (Domain.yourDomain domain) then
-                                            ("User wasn't authorized to list mailboxes for " ^ domain,
-                                             SOME "You're not authorized to configure that domain.")
-                                        else
-                                            case Vmail.list domain of
-                                                Vmail.Listing users => (Msg.send (bio, MsgMailboxes users);
-                                                                        ("Sent mailbox list for " ^ domain,
-                                                                         NONE))
-                                              | Vmail.Error msg => ("Error listing mailboxes for " ^ domain ^ ": " ^ msg,
-                                                                    SOME msg))
-                                    (fn () => ())
-
-                             | MsgNewMailbox {domain, user = emailUser, passwd, mailbox} =>
-                               doIt (fn () =>
-                                        if not (Domain.yourDomain domain) then
-                                            ("User wasn't authorized to add a mailbox to " ^ domain,
-                                             SOME "You're not authorized to configure that domain.")
-                                        else if not (Domain.validEmailUser emailUser) then
-                                            ("Invalid e-mail username " ^ emailUser,
-                                             SOME "Invalid e-mail username")
-                                        else if not (CharVector.all Char.isGraph passwd) then
-                                            ("Invalid password",
-                                             SOME "Invalid password; may only contain printable, non-space characters")
-                                        else if not (Domain.yourPath mailbox) then
-                                            ("User wasn't authorized to add a mailbox at " ^ mailbox,
-                                             SOME "You're not authorized to use that mailbox location.")
-                                        else
-                                            case Vmail.add {requester = user,
-                                                            domain = domain, user = emailUser,
-                                                            passwd = passwd, mailbox = mailbox} of
-                                                NONE => ("Added mailbox " ^ emailUser ^ "@" ^ domain ^ " at " ^ mailbox,
-                                                         NONE)
-                                              | SOME msg => ("Error adding mailbox " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
-                                                             SOME msg))
-                                    (fn () => ())
-                               
-                             | MsgPasswdMailbox {domain, user = emailUser, passwd} =>
-                               doIt (fn () =>
-                                        if not (Domain.yourDomain domain) then
-                                            ("User wasn't authorized to change password of a mailbox for " ^ domain,
-                                             SOME "You're not authorized to configure that domain.")
-                                        else if not (Domain.validEmailUser emailUser) then
-                                            ("Invalid e-mail username " ^ emailUser,
-                                             SOME "Invalid e-mail username")
-                                        else if not (CharVector.all Char.isGraph passwd) then
-                                            ("Invalid password",
-                                             SOME "Invalid password; may only contain printable, non-space characters")
-                                        else
-                                            case Vmail.passwd {domain = domain, user = emailUser,
-                                                               passwd = passwd} of
-                                                NONE => ("Changed password of mailbox " ^ emailUser ^ "@" ^ domain,
-                                                         NONE)
-                                              | SOME msg => ("Error changing mailbox password for " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
-                                                             SOME msg))
-                                    (fn () => ())
-
-                             | MsgRmMailbox {domain, user = emailUser} =>
-                               doIt (fn () =>
-                                        if not (Domain.yourDomain domain) then
-                                            ("User wasn't authorized to change password of a mailbox for " ^ domain,
-                                             SOME "You're not authorized to configure that domain.")
-                                        else if not (Domain.validEmailUser emailUser) then
-                                            ("Invalid e-mail username " ^ emailUser,
-                                             SOME "Invalid e-mail username")
-                                        else
-                                            case Vmail.rm {domain = domain, user = emailUser} of
-                                                NONE => ("Deleted mailbox " ^ emailUser ^ "@" ^ domain,
-                                                         NONE)
-                                              | SOME msg => ("Error deleting mailbox " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
-                                                             SOME msg))
-                                    (fn () => ())
-
-                             | MsgSaQuery addr =>
-                               doIt (fn () =>
-                                        case checkAddr addr of
-                                            NONE => ("User tried to query SA filtering for " ^ addr,
-                                                     SOME "You aren't allowed to configure SA filtering for that recipient.")
-                                          | SOME addr' => (Msg.send (bio, MsgSaStatus (SetSA.query addr'));
-                                                           ("Queried SA filtering status for " ^ addr,
-                                                            NONE)))
-                                    (fn () => ())
-
-                             | MsgSaSet (addr, b) =>
-                               doIt (fn () =>
-                                        case checkAddr addr of
-                                            NONE => ("User tried to set SA filtering for " ^ addr,
-                                                     SOME "You aren't allowed to configure SA filtering for that recipient.")
-                                          | SOME addr' => (SetSA.set (addr', b);
-                                                           Msg.send (bio, MsgOk);
-                                                           ("Set SA filtering status for " ^ addr ^ " to "
-                                                            ^ (if b then "ON" else "OFF"),
-                                                            NONE)))
-                                    (fn () => ())
-
-                             | MsgSmtpLogReq domain =>
-                               doIt (fn () =>
-                                        if not (Domain.yourDomain domain) then
-                                            ("Unauthorized user tried to request SMTP logs for " ^ domain,
-                                             SOME "You aren't authorized to configure that domain.")
-                                        else
-                                            (SmtpLog.search (fn line => Msg.send (bio, MsgSmtpLogRes line))
-                                             domain;
-                                             ("Requested SMTP logs for " ^ domain,
-                                              NONE)))
-                               (fn () => ())
-
-                             | MsgQuery q =>
-                               doIt (fn () => (Msg.send (bio, answerQuery q);
-                                               (describeQuery q,
-                                                NONE)))
-                               (fn () => ())
-
-                             | _ =>
-                               doIt (fn () => ("Unexpected command",
-                                               SOME "Unexpected command"))
-                                    (fn () => ())
-               in
-                   cmdLoop ()
-               end
-                   handle OpenSSL.OpenSSL s =>
-                          (print ("OpenSSL error: " ^ s ^ "\n");
-                           OpenSSL.close bio
-                           handle OpenSSL.OpenSSL _ => ();
-                           loop ())
-                        | OS.SysErr (s, _) =>
-                          (print ("System error: " ^ s ^ "\n");
-                           OpenSSL.close bio
-                           handle OpenSSL.OpenSSL _ => ();
-                           loop ())
-                        | IO.Io {name, function, cause} =>
-                          (print ("IO error: " ^ function ^ " for " ^ name ^ "\n");
-                           app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory cause);
-                           OpenSSL.close bio
-                           handle OpenSSL.OpenSSL _ => ();
-                           loop ())
-                        | e =>
-                          (print "Unknown exception in main loop!\n";
-                           app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e);
-                           OpenSSL.close bio
-                           handle OpenSSL.OpenSSL _ => ();
-                           loop ())
+                     | OS.SysErr (s, _) =>
+                       (print ("System error: " ^ s ^ "\n");
+                        OpenSSL.close bio
+                        handle OpenSSL.OpenSSL _ => ();
+                        loop ())
+                     | IO.Io {name, function, cause} =>
+                       (print ("IO error: " ^ function ^ " for " ^ name ^ "\n");
+                        app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory cause);
+                        OpenSSL.close bio
+                        handle OpenSSL.OpenSSL _ => ();
+                        loop ())
+                     | OS.Path.InvalidArc =>
+                       (print "Invalid arc\n";
+                        OpenSSL.close bio
+                        handle OpenSSL.OpenSSL _ => ();
+                        loop ())
+                     | e =>
+                       (print "Unknown exception in main loop!\n";
+                        app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e);
+                        OpenSSL.close bio
+                        handle OpenSSL.OpenSSL _ => ();
+                        loop ()))
+           handle e as (OpenSSL.OpenSSL s) =>
+                  (print ("OpenSSL error: " ^ s ^ "\n");
+                   app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e);
+                   loop ())
+                | OS.SysErr (s, _) =>
+                  (print ("System error: " ^ s ^ "\n");
+                   loop ())
+                | IO.Io {name, function, cause} =>
+                  (print ("IO error: " ^ function ^ " for " ^ name ^ "\n");
+                   app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory cause);
+                   loop ())
+                | e =>
+                  (print "Unknown exception in main loop!\n";
+                   app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e);
+                   loop ())
     in
        print ("Domtool dispatcher starting up at " ^ now () ^ "\n");
        print "Listening for connections....\n";
@@ -1276,9 +1639,9 @@ fun slave () =
     let
        val host = Slave.hostname ()
 
-       val context = OpenSSL.context (Config.certDir ^ "/" ^ host ^ ".pem",
-                                      Config.keyDir ^ "/" ^ host ^ "/key.pem",
-                                      Config.trustStore)
+       val context = context (Config.certDir ^ "/" ^ host ^ ".pem",
+                              Config.keyDir ^ "/" ^ host ^ "/key.pem",
+                              Config.trustStore)
 
        val sock = OpenSSL.listen (context, Config.slavePort)
 
@@ -1327,7 +1690,7 @@ fun slave () =
                          | _ => (OpenSSL.close bio;
                                  loop ())
                end handle OpenSSL.OpenSSL s =>
-                          (print ("OpenSSL error: "^ s ^ "\n");
+                          (print ("OpenSSL error: " ^ s ^ "\n");
                            OpenSSL.close bio
                                          handle OpenSSL.OpenSSL _ => ();
                            loop ())
@@ -1337,6 +1700,17 @@ fun slave () =
                            OpenSSL.close bio
                            handle OpenSSL.OpenSSL _ => ();
                            loop ())
+                        | IO.Io {function, name, ...} =>
+                          (print ("IO error: " ^ function ^ ": " ^ name ^ "\n");
+                           OpenSSL.close bio
+                           handle OpenSSL.OpenSSL _ => ();
+                           loop ())
+                        | e =>
+                          (app (fn s => print (s ^ "\n")) (SMLofNJ.exnHistory e);
+                           print "Uncaught exception!\n";
+                           OpenSSL.close bio
+                           handle OpenSSL.OpenSSL _ => ();
+                           loop ())
     in
        loop ();
        OpenSSL.shutdown sock