Add Apache logging

[hcoop/domtool2.git] / src / domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 224755f..55531d8 100644 (file)
--- 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