Adding Apache SetEnv

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

diff --git a/src/domain.sml b/src/domain.sml
index b192236..c097128 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -114,10 +114,10 @@ val validGroup = validUser
 
 val _ = Env.type_one "no_spaces"
                     Env.string
-                    (CharVector.all (fn ch => not (Char.isSpace ch)))
+                    (CharVector.all (fn ch => not (Char.isSpace ch) andalso ch <> #"\"" andalso ch <> #"'"))
 val _ = Env.type_one "no_newlines"
                     Env.string
-                    (CharVector.all (fn ch => ch <> #"\n" andalso ch <> #"\r"))
+                    (CharVector.all (fn ch => ch <> #"\n" andalso ch <> #"\r" andalso ch <> #"\"" andalso ch <> #"'"))
 
 val _ = Env.type_one "ip"
        Env.string
@@ -584,9 +584,9 @@ val _ = Env.containerV_one "domain"
                                               (masterNode := SOME node;
                                                saveSoa ("master", #soa dns) node;
                                                saveNamed ("master", #soa dns, masterIp, slaveIps) node)
-                                            | _ => masterNode := NONE;
-                                          !befores dom
-                                      end
+                                            | _ => masterNode := NONE
+                                      end;
+                                  !befores dom
                               end,
                            fn () => !afters (!current))