X-Git-Url: https://git.hcoop.net/clinton/domtool2.git/blobdiff_plain/8d06030c085c5ae1d186b679bd142a04055cc239..d63aa5e7b08630cc17a606e85e35acc5bd0041ee:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 2b93535..affa1b1 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -70,8 +70,9 @@ fun setUser user =
 				class = "domain"};
 	your_usrs := Acl.class {user = getUser (),
 				class = "user"};
-	your_grps := Acl.class {user = getUser (),
-				class = "group"};
+	your_grps := SS.add (Acl.class {user = getUser (),
+					class = "group"},
+	                     "nogroup");
 	your_pths := your_paths;
 	readable_pths := SS.union (your_paths, world_readable);
 	your_ipss := Acl.class {user = getUser (),
@@ -133,15 +134,18 @@ fun validDomain s =
 fun validNode s = List.exists (fn s' => s = s') nodes
 
 fun yourDomain s = !fakePrivs orelse SS.member (your_domains (), s)
-fun yourUser s = SS.member (your_users (), s)
-fun yourGroup s = SS.member (your_groups (), s)
+fun yourUser s = !fakePrivs orelse SS.member (your_users (), s)
+fun yourGroup s = !fakePrivs orelse SS.member (your_groups (), s)
+
 fun checkPath paths path =
+    !fakePrivs orelse
     (List.all (fn s => s <> "..") (String.fields (fn ch => ch = #"/") path)
      andalso CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"." orelse ch = #"/"
 				      orelse ch = #"-" orelse ch = #"_") path
      andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (paths ()))
 val yourPath = checkPath your_paths
 val readablePath = checkPath readable_paths
+
 fun yourIp s = !fakePrivs orelse SS.member (your_ips (), s)
 
 fun yourDomainHost s =
@@ -267,41 +271,14 @@ val _ = Env.registerFunction ("end_in_slash",
 			       | _ => NONE)
 
 
-val nsD = (EString Config.defaultNs, dl)
-val serialD = (EVar "serialAuto", dl)
-val refD = (EInt Config.defaultRefresh, dl)
-val retD = (EInt Config.defaultRetry, dl)
-val expD = (EInt Config.defaultExpiry, dl)
-val minD = (EInt Config.defaultMinimum, dl)
-
-val soaD = multiApp ((EVar "soa", dl),
-		     dl,
-		     [nsD, serialD, refD, retD, expD, minD])
-
-val masterD = (EApp ((EVar "internalMaster", dl),
-		     (EString Config.Bind.masterNode, dl)),
-	       dl)
+val _ = Env.registerFunction ("you",
+			      fn [] => SOME (EString (getUser ()), dl)
+			      | _ => NONE)
 
-val slavesD = (EList (map (fn s => (EString s, dl))
-			  (List.filter (fn x => List.exists (fn y => y = x) (Config.dnsNodes_all @ Config.dnsNodes_admin)) Config.Bind.slaveNodes)), dl)
-
-val _ = Defaults.registerDefault ("Aliases",
-				  (TList (TBase "your_domain", dl), dl),
-				  (fn () => (EList [], dl)))
-
-val _ = Defaults.registerDefault ("Mailbox",
-				  (TBase "email", dl),
-				  (fn () => (EString (getUser ()), dl)))
-
-val _ = Defaults.registerDefault ("DNS",
-				  (TBase "dnsKind", dl),
-				  (fn () => multiApp ((EVar "useDns", dl),
-						      dl,
-						      [soaD, masterD, slavesD])))
+val _  = Env.registerFunction ("defaultMailbox",
+			       fn [] => SOME (EString (getUser ()), dl)
+			       | _ => NONE)
 
-val _ = Defaults.registerDefault ("TTL",
-				  (TBase "int", dl),
-				  (fn () => (EInt Config.Bind.defaultTTL, dl)))
 
 type soa = {ns : string,
 	    serial : int option,
@@ -892,6 +869,7 @@ fun homedirOf uname =
     Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam uname)
 
 fun homedir () = homedirOf (getUser ())
+		 handle e => if !fakePrivs then "/tmp" else raise e
 
 type subject = {node : string, domain : string}