MDL-9286 Incorrect setting of defaults for rpc_negotiation_timeout ; merged from...

diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index f8baa0758e50895afffa4a4508e0af3f9fcbd5e5..3359b5542839f2288f78c2f64bf43e7afc97c902 100644 (file)
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -695,7 +695,7 @@ class auth_plugin_mnet extends auth_plugin_base {
     function process_config($config) {
         // set to defaults if undefined
         if (!isset ($config->rpc_negotiation_timeout)) {
-            $config->host = '30';
+            $config->rpc_negotiation_timeout = '30';
         }
         if (!isset ($config->auto_add_remote_users)) {
             $config->auto_add_remote_users = '0';