MDL-15933 Require jump destination MNET peer to be non-deleted.
Also require landing source MNET peer to be non-deleted.
This commit is contained in:
+4
-1
@@ -241,7 +241,7 @@ class auth_plugin_mnet extends auth_plugin_base {
|
||||
require_once $CFG->dirroot . '/mnet/xmlrpc/client.php';
|
||||
|
||||
// verify the remote host is configured locally before attempting RPC call
|
||||
if (! $remotehost = $DB->get_record('mnet_host', array('wwwroot'=>$remotewwwroot))) {
|
||||
if (! $remotehost = $DB->get_record('mnet_host', array('wwwroot' => $remotewwwroot, 'deleted' => 0))) {
|
||||
print_error('notpermittedtoland', 'mnet');
|
||||
}
|
||||
|
||||
@@ -1302,9 +1302,12 @@ class auth_plugin_mnet extends auth_plugin_base {
|
||||
svc.apiversion,
|
||||
h2s.id as h2s_id
|
||||
FROM
|
||||
{mnet_host} h,
|
||||
{mnet_service} svc,
|
||||
{mnet_host2service} h2s
|
||||
WHERE
|
||||
h.deleted = '0' AND
|
||||
h.id = h2s.hostid AND
|
||||
h2s.hostid = ? AND
|
||||
h2s.serviceid = svc.id AND
|
||||
svc.name = ? AND
|
||||
|
||||
Reference in New Issue
Block a user