Fixing user determination

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

diff --git a/src/main.sml b/src/main.sml
index 9f01855..afd0ce9 100644 (file)
--- 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)
@@ -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)