mysql: revoke permissions when dropping database

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

diff --git a/src/main.sml b/src/main.sml
index 3079263..c6272f2 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -542,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
@@ -754,23 +754,6 @@ fun requestSmtpLog domain =
        OpenSSL.close bio
     end
 
-fun requestMysqlFixperms () =
-    let
-       val (_, context) = requestContext (fn () => ())
-       val bio = OpenSSL.connect true (context,
-                                       Config.Dbms.dbmsNode ^ ":" ^ Int.toString Config.slavePort)
-    in
-       Msg.send (bio, MsgMysqlFixperms);
-       case Msg.recv bio of
-           NONE => print "Server closed connection unexpectedly.\n"
-         | SOME m =>
-           case m of
-               MsgOk => print "Permissions granted.\n"
-             | MsgError s => print ("Failed: " ^ s ^ "\n")
-             | _ => print "Unexpected server reply.\n";
-       OpenSSL.close bio
-    end
-
 fun requestApt {node, pkg} =
     let
        val (user, context) = requestContext (fn () => ())
@@ -1110,7 +1093,7 @@ fun regenerateEither tc checker context =
 
        val ok = ref true
  
-       fun contactNode (node, ip) =
+       fun contactNode (node, ip, ipv6) =
            if node = Config.dispatcherName then
                Domain.resetLocal ()
            else let
@@ -1847,16 +1830,6 @@ fun slave () =
                                                  ("Invalid database name " ^ user ^ "_" ^ dbname,
                                                   SOME ("Invalid database name " ^ dbname)))
                                          (fn () => ())
-                                  | MsgMysqlFixperms =>
-                                    (print "Starting mysql-fixperms\n";
-                                     doIt (fn () => if OS.Process.isSuccess
-                                                           (OS.Process.system "/usr/bin/sudo -H /afs/hcoop.net/common/etc/scripts/mysql-grant-table-drop") then
-                                                        ("Requested mysql-fixperms",
-                                                         NONE)
-                                                    else
-                                                        ("Requested mysql-fixperms, but execution failed!",
-                                                         SOME "Script execution failed."))
-                                          (fn () => ()))
                                   | MsgFirewallRegen =>
                                     doIt (fn () => (Acl.read Config.aclFile;
                                                     if Acl.query {user = user, class = "priv", value = "all"} then