HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing little bugs during first deleuze/mire test
[hcoop/domtool2.git]
/
src
/
main.sml
diff --git
a/src/main.sml
b/src/main.sml
index
87a1b73
..
a3b78e8
100644
(file)
--- a/
src/main.sml
+++ b/
src/main.sml
@@
-63,6
+63,12
@@
fun basis () =
fun check fname =
let
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 ()
val _ = ErrorMsg.reset ()
val _ = Env.preTycheck ()
@@
-133,15
+139,13
@@
fun hostname () =
fun request fname =
let
fun request fname =
let
+ val _ = check fname
+
val uid = Posix.ProcEnv.getuid ()
val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
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",
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)
Config.trustStore)
val bio = OpenSSL.connect (context, dispatcher)
@@
-234,6
+238,7
@@
fun service () =
cmdLoop ()
end
in
cmdLoop ()
end
in
+ print "Listening for connections....\n";
loop ();
OpenSSL.shutdown sock
end
loop ();
OpenSSL.shutdown sock
end
@@
-243,7
+248,7
@@
fun slave () =
val host = hostname ()
val context = OpenSSL.context (Config.certDir ^ "/" ^ host ^ ".pem",
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)
Config.trustStore)
val sock = OpenSSL.listen (context, Config.slavePort)