X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/361a1e7f7b226811bdb8b4cc0266f34f01ac4bcd..7af7d4cb58acc571a75b51c0dd0f1b4d9c92e619:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index 9f01855..19162a3 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -63,12 +63,6 @@ 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 ()
 
@@ -139,13 +133,19 @@ fun hostname () =
 
 fun request 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 _ = check fname
 
 	val uid = Posix.ProcEnv.getuid ()
 	val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
 
 	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)
@@ -248,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)
@@ -287,6 +287,11 @@ fun slave () =
 			    OpenSSL.close bio
 					  handle OpenSSL.OpenSSL _ => ();
 			    loop ())
+			 | OS.SysErr (s, _) =>
+			   (print ("System error: "^ s ^ "\n");
+			    OpenSSL.close bio
+			    handle OpenSSL.OpenSSL _ => ();
+			    loop ())
     in
 	loop ();
 	OpenSSL.shutdown sock