init.d script for domtool-slave

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

diff --git a/src/domain.sml b/src/domain.sml
index 04ee532..4e38a98 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -102,6 +102,14 @@ val yourDomain = yourDomainHost
 fun validUser s = size s > 0 andalso size s < 20
                  andalso CharVector.all Char.isAlphaNum s
 
+fun validEmailUser s =
+    size s > 0 andalso size s < 50
+    andalso CharVector.all (fn ch => Char.isAlphaNum ch
+                                    orelse ch = #"."
+                                    orelse ch = #"_"
+                                    orelse ch = #"-"
+                                    orelse ch = #"+") s
+
 val validGroup = validUser
 
 val _ = Env.type_one "no_spaces"
@@ -693,7 +701,7 @@ fun rmdom doms =
                                before Posix.FileSys.closedir dir
                            end
                                handle OS.SysErr _ =>
-                                      (print ("Warning: System error deleteing domain " ^ dom ^ " on " ^ node ^ ".\n");
+                                      (print ("Warning: System error deleting domain " ^ dom ^ " on " ^ node ^ ".\n");
                                        actions)
                    in
                        visitDom (dom, dname, actions)