X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/3196000d8e29e14665f43ffd74460b2e6d592250..a088cea68cf4ca19249d4cf8591e95228dba13f1:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index 87a1b73..a3b78e8 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -63,6 +63,12 @@ fun basis () =
 
 fun check fname =
     let
+	val uid = Posix.ProcEnv.getuid ()
+	val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
+
+	val () = Acl.read Config.aclFile
+	val () = Domain.setUser user
+
 	val _ = ErrorMsg.reset ()
 	val _ = Env.preTycheck ()
 
@@ -133,15 +139,13 @@ fun hostname () =
 
 fun request fname =
     let
+	val _ = check fname
+
 	val uid = Posix.ProcEnv.getuid ()
 	val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
 
-	val () = Acl.read Config.aclFile
-	val () = Domain.setUser user
-	val _ = check fname
-
 	val context = OpenSSL.context (Config.certDir ^ "/" ^ user ^ ".pem",
-				       Config.keyDir ^ "/" ^ user ^ ".pem",
+				       Config.keyDir ^ "/" ^ user ^ "/key.pem",
 				       Config.trustStore)
 
 	val bio = OpenSSL.connect (context, dispatcher)
@@ -234,6 +238,7 @@ fun service () =
 		    cmdLoop ()
 		end
     in
+	print "Listening for connections....\n";
 	loop ();
 	OpenSSL.shutdown sock
     end
@@ -243,7 +248,7 @@ fun slave () =
 	val host = hostname ()
 
 	val context = OpenSSL.context (Config.certDir ^ "/" ^ host ^ ".pem",
-				       Config.keyDir ^ "/" ^ host ^ ".pem",
+				       Config.keyDir ^ "/" ^ host ^ "/key.pem",
 				       Config.trustStore)
 
 	val sock = OpenSSL.listen (context, Config.slavePort)