HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes before announcement to hcoop-discuss
[hcoop/domtool2.git]
/
src
/
main.sml
diff --git
a/src/main.sml
b/src/main.sml
index
87a1b73
..
461207a
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,13
+139,11
@@
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",
Config.keyDir ^ "/" ^ user ^ ".pem",
Config.trustStore)
val context = OpenSSL.context (Config.certDir ^ "/" ^ user ^ ".pem",
Config.keyDir ^ "/" ^ user ^ ".pem",
Config.trustStore)