X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/2ed6d0e50d89234c3d63c3707e855c922bd49358..12adf55a902b1d9bde677e4636530e5753857e05:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 6a70c72..f0e7635 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -21,11 +21,19 @@
 structure Domain :> DOMAIN = struct
 
 structure SM = DataStructures.StringMap
+structure SS = DataStructures.StringSet
 
-val nodes = map #2 Config.nodeIps
+val nodes = map #1 Config.nodeIps
 val nodeMap = foldl (fn ((node, ip), mp) => SM.insert (mp, node, ip))
 		    SM.empty Config.nodeIps
 
+val usr = ref ""
+fun setUser ur = usr := ur
+fun getUser () = !usr
+
+val your_doms = ref SS.empty
+fun your_domains () = !your_doms
+
 fun validIp s =
     case map Int.fromString (String.fields (fn ch => ch = #".") s) of
 	[SOME n1, SOME n2, SOME n3, SOME n4] =>
@@ -44,6 +52,8 @@ fun validDomain s =
 
 fun validNode s = List.exists (fn s' => s = s') nodes
 
+fun yourDomain s = SS.member (your_domains (), s)
+
 val _ = Env.type_one "ip"
 	Env.string
 	validIp
@@ -56,6 +66,10 @@ val _ = Env.type_one "domain"
 	Env.string
 	validDomain
 
+val _ = Env.type_one "your_domain"
+	Env.string
+	yourDomain
+
 val _ = Env.type_one "node"
 	Env.string
 	validNode
@@ -411,6 +425,11 @@ val _ = Env.containerV_one "domain"
 			       end,
 			    fn () => !afters (!current))
 
+val () = Env.registerPreTycheck (fn () => (setUser Config.testUser;
+					   Acl.read Config.aclFile;
+					   your_doms := Acl.class {user = getUser (),
+								   class = "domain"}))
+
 val () = Env.registerPre (fn () => (ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
 						       fn cl => "Temp file cleanup failed: " ^ cl));
 				    OS.FileSys.mkDir Config.tmpDir;
@@ -457,9 +476,9 @@ val () = Env.registerPost (fn () =>
 				  if !ErrorMsg.anyErrors then
 				      ()
 				  else
-				      Slave.handleChanges (map #2 diffs);
+				      Slave.handleChanges (map #2 diffs)(*;
 				  ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
-						     fn cl => "Temp file cleanup failed: " ^ cl))
+						     fn cl => "Temp file cleanup failed: " ^ cl))*)
 			      end)