# HG changeset patch # User Matthew Wild # Date 1307075804 -3600 # Node ID cfa69c19b428e9603def4781720f87c3dcd00513 # Parent e2674029b8c9a473c8a6998f7d3d5303633bbadd# Parent b991ffa0f2c55ab97bcd6dd2d946243c5bb1dd54 Merge with Florob diff -r e2674029b8c9 -r cfa69c19b428 plugins/mod_admin_adhoc.lua --- a/plugins/mod_admin_adhoc.lua Fri Jun 03 05:35:22 2011 +0100 +++ b/plugins/mod_admin_adhoc.lua Fri Jun 03 05:36:44 2011 +0100 @@ -600,7 +600,7 @@ local list_modules_desc = adhoc_new("List loaded modules", "http://prosody.im/protocol/modules#list", list_modules_handler, "admin"); local load_module_desc = adhoc_new("Load module", "http://prosody.im/protocol/modules#load", load_module_handler, "admin"); local reload_modules_desc = adhoc_new("Reload modules", "http://prosody.im/protocol/modules#reload", reload_modules_handler, "admin"); -local shut_down_service_desc = adhoc_new("Shut Down Service", "http://jabber.org/protocol/admin#shutdown", shut_down_service_handler, "admin"); +local shut_down_service_desc = adhoc_new("Shut Down Service", "http://jabber.org/protocol/admin#shutdown", shut_down_service_handler, "global_admin"); local unload_modules_desc = adhoc_new("Unload modules", "http://prosody.im/protocol/modules#unload", unload_modules_handler, "admin"); module:add_item("adhoc", add_user_desc);