X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/9b8c6dc8df86d6ba1c7512cb12445912a9035a89..7ad80c2038b827f5f47a2768b790967cc9e12b7d:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index cdc3580..e2528b6 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,40 +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.masterNode, dl)),
-	       dl)
+val _ = Env.registerFunction ("you",
+			      fn [] => SOME (EString (getUser ()), dl)
+			      | _ => NONE)
 
-val slavesD = (EList (map (fn s => (EString s, dl)) Config.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,
@@ -679,7 +657,6 @@ val _ = Env.containerV_one "domain"
 
 					   val slaveIps = map nodeIp (#slaves dns)
 				       in
-					   app (saveSoa ("slave", #soa dns)) (#slaves dns);
 					   app (saveNamed ("slave", #soa dns, masterIp, slaveIps)) (#slaves dns);
 					   case #master dns of
 					       InternalMaster node =>
@@ -711,7 +688,7 @@ fun handleSite (site, files) =
 	
     in
 	print ("New configuration for node " ^ site ^ "\n");
-	if site = Config.defaultNode then
+	if site = Config.dispatcherName then
 	    Slave.handleChanges files
 	else let
 		val bio = OpenSSL.connect true (valOf (!ssl_context),
@@ -891,6 +868,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}