X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/6bb366c5a60247419dce5cbce4a5c034fa2f1e5c..51be7da6b88fb5c93db9b03dc7f5abc710590be2:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index 461207a..afd0ce9 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -63,11 +63,11 @@ fun basis () =
 
 fun check fname =
     let
-	val uid = Posix.ProcEnv.getuid ()
+	(*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 () = Domain.setUser user*)
 
 	val _ = ErrorMsg.reset ()
 	val _ = Env.preTycheck ()
@@ -145,7 +145,7 @@ fun request fname =
 	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)
@@ -238,6 +238,7 @@ fun service () =
 		    cmdLoop ()
 		end
     in
+	print "Listening for connections....\n";
 	loop ();
 	OpenSSL.shutdown sock
     end
@@ -247,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)