X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/edd380241e9ba2b750eb9a1f82ffd6feeab6252f..559e89e9adf62c5faeb0e78e6b9fb8fe107b8c72:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 224755f..27bc806 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -72,16 +72,21 @@ fun yourPath path =
     andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (your_paths ())
 
 fun yourDomainHost s =
-    let
+    yourDomain s
+    orelse let
 	val (pref, suf) = Substring.splitl (fn ch => ch <> #".") (Substring.full s)
     in
-	print ("pref[" ^ Substring.string pref ^ "] suf[" ^ Substring.string suf ^ "]\n");
 	Substring.size suf > 0
 	andalso validHost (Substring.string pref)
 	andalso yourDomain (Substring.string
-			       (Substring.slice (suf, 1, NONE)))
+				(Substring.slice (suf, 1, NONE)))
     end
 
+fun validUser s = size s > 0 andalso size s < 20
+		  andalso CharVector.all Char.isAlphaNum s
+
+val validGroup = validUser
+
 val _ = Env.type_one "no_spaces"
 		     Env.string
 		     (CharVector.all (fn ch => not (Char.isSpace ch)))
@@ -109,6 +114,14 @@ val _ = Env.type_one "your_domain_host"
 	Env.string
 	yourDomainHost
 
+val _ = Env.type_one "user"
+	Env.string
+	validUser
+
+val _ = Env.type_one "group"
+	Env.string
+	validGroup
+
 val _ = Env.type_one "your_user"
 	Env.string
 	yourUser
@@ -209,6 +222,7 @@ val dnsKind = fn (EApp ((EApp ((EApp
 				    master = mstr,
 				    slaves = slaves})
 		    | _ => NONE)
+	       | (EVar "noDns", _) => SOME NoDns
 	       | _ => NONE
 
 val befores = ref (fn (_ : string) => ())
@@ -533,9 +547,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)