Proper username determination in requests

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

diff --git a/src/main.sml b/src/main.sml
index 87a1b73..59607bb 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -138,10 +138,14 @@ fun request fname =
 
        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)
@@ -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)