aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2021-12-15 14:12:32 +1000
committeronefang2021-12-15 14:12:32 +1000
commit328d242122f60f640e8ca44c605a135729281f31 (patch)
treea09487c884ca3c66732dbfa20cf3618074573ab8
parentsledjchisl build command done outside of tmux stuff. (diff)
downloadopensim-SC-328d242122f60f640e8ca44c605a135729281f31.zip
opensim-SC-328d242122f60f640e8ca44c605a135729281f31.tar.gz
opensim-SC-328d242122f60f640e8ca44c605a135729281f31.tar.bz2
opensim-SC-328d242122f60f640e8ca44c605a135729281f31.tar.xz
Update log4net to avoid log4shell security hole.
Alledgedly.
-rw-r--r--OpenSim/Region/Application/Application.cs3
-rw-r--r--bin/log4net.dllbin266240 -> 270336 bytes
2 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 7c3b6c5..d6c449c 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -103,6 +103,9 @@ namespace OpenSim
103 else 103 else
104 { 104 {
105 XmlConfigurator.Configure(); 105 XmlConfigurator.Configure();
106//// The fixed version of log4net doesn't support this, but the broken one does. FFS!
107//// m_log.InfoFormat("[OPENSIM MAIN]: configured log4net {0} using default OpenSim.exe.config", log4net.AssemblyInfo.Version);
108//// m_log.Info("[OPENSIM MAIN]: " + log4net.AssemblyInfo.Info);
106 m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config"); 109 m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config");
107 } 110 }
108 111
diff --git a/bin/log4net.dll b/bin/log4net.dll
index 7740fbd..064f420 100644
--- a/bin/log4net.dll
+++ b/bin/log4net.dll
Binary files differ