dbms: use nodeIp instead of raw hostname

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

diff --git a/src/main.sml b/src/main.sml
index fcbcafe..3a31c34 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -118,6 +118,7 @@ fun check G fname =
 
 fun notTmp s =
     String.sub (s, 0) <> #"."
+    andalso s <> "_darcs"
     andalso CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"." orelse ch = #"_" orelse ch = #"-") s
 
 fun setupUser () =
@@ -541,7 +542,7 @@ fun requestDbUser dbtype =
     let
        val (_, context) = requestContext (fn () => ())
        val bio = OpenSSL.connect true (context,
-                                       Config.Dbms.dbmsNode ^ ":" ^ Int.toString Config.slavePort)
+                                       Domain.nodeIp Config.Dbms.dbmsNode ^ ":" ^ Int.toString Config.slavePort)
     in
        Msg.send (bio, MsgCreateDbUser dbtype);
        case Msg.recv bio of
@@ -1172,7 +1173,7 @@ fun regenerateEither tc checker context =
                            ignore (foldl checker' (basis', SM.empty) files)
                        end
                    end
-               else if String.isSuffix "_admin" user then
+               else if (String.isSuffix "_admin" user) orelse (String.isSuffix ".daemon" user) then
                    ()    
                else
                    (print ("Couldn't access " ^ user ^ "'s ~/.domtool directory.\n");