Better error message for fwtool

diff --git a/src/main.sml b/src/main.sml
index 9463ce2..f2beee8 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -1771,14 +1771,16 @@ fun slave () =
                                                          SOME "Script execution failed."))
                                           (fn () => ()))
                                   | MsgFirewallRegen =>
-                                    doIt (fn () => if Acl.query {user = user, class = "priv", value = "all"} andalso List.exists (fn x => x = host) Config.Firewall.firewallNodes then
-                                                       if (Firewall.generateFirewallConfig (Firewall.parseRules ()) andalso Firewall.publishConfig ())
-                                                       then
-                                                           ("Firewall rules regenerated.", NONE)
-                                                       else
-                                                           ("Rules regeneration failed!", SOME "Script execution failed.")
+                                    doIt (fn () => if Acl.query {user = user, class = "priv", value = "all"} then
+                                                       if List.exists (fn x => x = host) Config.Firewall.firewallNodes then
+                                                           if (Firewall.generateFirewallConfig (Firewall.parseRules ()) andalso Firewall.publishConfig ())
+                                                           then
+                                                               ("Firewall rules regenerated.", NONE)
+                                                           else
+                                                               ("Rules regeneration failed!", SOME "Script execution failed.")
+                                                       else ("Node not controlled by domtool firewall.", SOME (host))
                                                    else
-                                                       ("Not authorized to regenerate firewall.", SOME ("Unauthorized user " ^ user ^ "attempted to regenerated firewall")))
+                                                       ("Not authorized to regenerate firewall.", SOME ("Unauthorized user " ^ user ^ " attempted to regenerated firewall")))
                                          (fn () => ())
 
                                   | _ => (OpenSSL.close bio;