(* HCoop Domtool (http://hcoop.sourceforge.net/)
- * Copyright (c) 2006-2007, Adam Chlipala
+ * Copyright (c) 2006-2009, Adam Chlipala
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
val (_, files) = Order.order (SOME b) files
val _ = if !ErrorMsg.anyErrors then
- (print "J\n";raise ErrorMsg.Error)
+ raise ErrorMsg.Error
else
()
OpenSSL.close bio
end
+fun requestReUsers () =
+ let
+ val (_, bio) = requestBio (fn () => ())
+ in
+ Msg.send (bio, MsgReUsers);
+ case Msg.recv bio of
+ NONE => print "Server closed connection unexpectedly.\n"
+ | SOME m =>
+ case m of
+ MsgOk => print "Callbacks run.\n"
+ | MsgError s => print ("Failed: " ^ s ^ "\n")
+ | _ => print "Unexpected server reply.\n";
+ OpenSSL.close bio
+ end
+
structure SS = StringSet
fun domainList dname =
(fn G => fn evs => fn file =>
(#1 (check G file), evs))
+fun usersChanged () =
+ (Domain.onUsersChange ();
+ ignore (OS.Process.system Config.publish_reusers))
+
fun rmuser user =
let
val doms = Acl.class {user = user, class = "domain"}
| _ => false) (StringSet.listItems doms)
in
Acl.rmuser user;
- Domain.rmdom doms
+ Domain.rmdom doms;
+ usersChanged ()
end
fun now () = Date.toString (Date.fromTimeUniv (Time.now ()))
if Acl.query {user = user, class = "priv", value = "all"} then
(Acl.grant acl;
Acl.write Config.aclFile;
+ if #class acl = "user" then
+ usersChanged ()
+ else
+ ();
("Granted permission " ^ #value acl ^ " to " ^ #user acl ^ " in " ^ #class acl ^ ".",
NONE))
else
(fn () => ())
| MsgMysqlFixperms =>
- 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)
+ (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 () => ())
+ (fn () => ()))
| MsgDescribe dom =>
doIt (fn () => if not (Domain.validDomain dom) then
NONE)))
(fn () => ())
+ | MsgReUsers =>
+ doIt (fn () => (usersChanged ();
+ ("Users change callbacks run", NONE)))
+ (fn () => ())
+
| _ =>
doIt (fn () => ("Unexpected command",
SOME "Unexpected command"))