Simple OpenSSL stuff in SML/NJ

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

diff --git a/src/domain.sml b/src/domain.sml
index 4b4042f..27bc806 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -72,13 +72,14 @@ fun yourPath path =
     andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (your_paths ())
 
 fun yourDomainHost s =
     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
        Substring.size suf > 0
        andalso validHost (Substring.string pref)
        andalso yourDomain (Substring.string
        val (pref, suf) = Substring.splitl (fn ch => ch <> #".") (Substring.full s)
     in
        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
     end
 
 fun validUser s = size s > 0 andalso size s < 20


@@ -221,6 +222,7 @@ val dnsKind = fn (EApp ((EApp ((EApp
                                    master = mstr,
                                    slaves = slaves})
                    | _ => NONE)
                                    master = mstr,
                                    slaves = slaves})
                    | _ => NONE)

+              | (EVar "noDns", _) => SOME NoDns

               | _ => NONE
 
 val befores = ref (fn (_ : string) => ())
               | _ => NONE
 
 val befores = ref (fn (_ : string) => ())


@@ -545,9 +547,9 @@ val () = Env.registerPost (fn () =>
                                  if !ErrorMsg.anyErrors then
                                      ()
                                  else
                                  if !ErrorMsg.anyErrors then
                                      ()
                                  else

-                                     Slave.handleChanges (map #2 diffs)(*;
+                                     Slave.handleChanges (map #2 diffs);

                                  ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
                                  ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],

-                                                    fn cl => "Temp file cleanup failed: " ^ cl))*)
+                                                    fn cl => "Temp file cleanup failed: " ^ cl))

                              end)
 
 
                              end)