HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Factor error message generation into a separate file; add '-tc' flag to domtool-client
[hcoop/domtool2.git]
/
src
/
main.sml
diff --git
a/src/main.sml
b/src/main.sml
index
51b8347
..
a8cf180
100644
(file)
--- a/
src/main.sml
+++ b/
src/main.sml
@@
-176,7
+176,7
@@
fun context x =
(print "Couldn't find your certificate.\nYou probably haven't been given any Domtool privileges.\n";
raise e)
(print "Couldn't find your certificate.\nYou probably haven't been given any Domtool privileges.\n";
raise e)
-fun
requestContext f
=
+fun
setupUser ()
=
let
val user =
case Posix.ProcEnv.getenv "DOMTOOL_USER" of
let
val user =
case Posix.ProcEnv.getenv "DOMTOOL_USER" of
@@
-187,9
+187,15
@@
fun requestContext f =
Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
end
| SOME user => user
Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
end
| SOME user => user
-
- val () = Acl.read Config.aclFile
- val () = Domain.setUser user
+ in
+ Acl.read Config.aclFile;
+ Domain.setUser user;
+ user
+ end
+
+fun requestContext f =
+ let
+ val user = setupUser ()
val () = f ()
val () = f ()