X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/e903f39884591490f7a023a730149cb1894b499d..86e132be99dcdbf2271119267cea6b91eb8207c3:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index 4198901..f32fa2d 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -96,7 +96,24 @@ fun notTmp s =
     String.sub (s, 0) <> #"."
     andalso CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"." orelse ch = #"_" orelse ch = #"-") s
 
-fun checkDir dname =
+fun setupUser () =
+    let
+	val user =
+	    case Posix.ProcEnv.getenv "DOMTOOL_USER" of
+		NONE =>
+		let
+		    val uid = Posix.ProcEnv.getuid ()
+		in
+		    Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
+		end
+	      | SOME user => user
+    in
+	Acl.read Config.aclFile;
+	Domain.setUser user;
+	user
+    end
+
+fun checkDir' dname =
     let
 	val b = basis ()
 
@@ -127,6 +144,10 @@ fun checkDir dname =
 		 ())
     end
 
+fun checkDir dname =
+    (setupUser ();
+     checkDir' dname)
+
 fun reduce fname =
     let
 	val (G, body) = check fname
@@ -180,23 +201,6 @@ fun context x =
 	    print ("Additional information: " ^ s ^ "\n");
 	    raise e)
 
-fun setupUser () =
-    let
-	val user =
-	    case Posix.ProcEnv.getenv "DOMTOOL_USER" of
-		NONE =>
-		let
-		    val uid = Posix.ProcEnv.getuid ()
-		in
-		    Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
-		end
-	      | SOME user => user
-    in
-	Acl.read Config.aclFile;
-	Domain.setUser user;
-	user
-    end
-
 fun requestContext f =
     let
 	val user = setupUser ()
@@ -262,7 +266,7 @@ fun requestDir dname =
 
 	val _ = ErrorMsg.reset ()
 
-	val (user, bio) = requestBio (fn () => checkDir dname)
+	val (user, bio) = requestBio (fn () => checkDir' dname)
 
 	val b = basis ()