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

diff --git a/auth/mnet/config.html b/auth/mnet/config.html
index 070d07d3dd0f30cb69c4f913dd9b0cf3bf17d319..d85b9b304d9bcfa1fde80e5ad81eb642384bcbaa 100644 (file)
--- a/auth/mnet/config.html
+++ b/auth/mnet/config.html
@@ -2,7 +2,7 @@
 
 // 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';