* In OpenSim.ini.example, list defaults for AllowOSFunctions and OSFunctionThreatLevel and change existing OpenSim.ini.example settings

2 files changed, 34 insertions, 30 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
index c8ae224..3862546 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
@@ -128,34 +128,35 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 
             switch (header[156]) 
             {
-            case 0:
-                tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE;
+                case 0:
+                    tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE;
+                    break;
+                case (byte)'0':
+                    tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE;
+                break;
+                case (byte)'1':
+                    tarHeader.EntryType = TarEntryType.TYPE_HARD_LINK;
+                break;
+                case (byte)'2':
+                    tarHeader.EntryType = TarEntryType.TYPE_SYMBOLIC_LINK;
+                break;
+                case (byte)'3':
+                    tarHeader.EntryType = TarEntryType.TYPE_CHAR_SPECIAL;
+                break;
+                case (byte)'4':
+                    tarHeader.EntryType = TarEntryType.TYPE_BLOCK_SPECIAL;
+                break;
+                case (byte)'5':
+                    tarHeader.EntryType = TarEntryType.TYPE_DIRECTORY;
+                break;
+                case (byte)'6':
+                    tarHeader.EntryType = TarEntryType.TYPE_FIFO;
+                break;
+                case (byte)'7':
+                    tarHeader.EntryType = TarEntryType.TYPE_CONTIGUOUS_FILE;
                 break;
-            case (byte)'0':
-                tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE;
-            break;
-            case (byte)'1':
-                tarHeader.EntryType = TarEntryType.TYPE_HARD_LINK;
-            break;
-            case (byte)'2':
-                tarHeader.EntryType = TarEntryType.TYPE_SYMBOLIC_LINK;
-            break;
-            case (byte)'3':
-                tarHeader.EntryType = TarEntryType.TYPE_CHAR_SPECIAL;
-            break;
-            case (byte)'4':
-                tarHeader.EntryType = TarEntryType.TYPE_BLOCK_SPECIAL;
-            break;
-            case (byte)'5':
-                tarHeader.EntryType = TarEntryType.TYPE_DIRECTORY;
-            break;
-            case (byte)'6':
-                tarHeader.EntryType = TarEntryType.TYPE_FIFO;
-            break;
-            case (byte)'7':
-                tarHeader.EntryType = TarEntryType.TYPE_CONTIGUOUS_FILE;
-            break;
             }       
+            
             return tarHeader;
         }
 
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 7fe7e09..f1f8f8b 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -696,10 +696,13 @@ InterregionComms = "RESTComms"
     MaintenanceLoopTicks_Other=10
 
     ; Allow the use of os* functions (some are dangerous)
-    AllowOSFunctions = true
+    ; Default is false
+    AllowOSFunctions = false
 
-    ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
-    OSFunctionThreatLevel = Low
+    ; Threat level to allow if os functions are enabled
+    ; One of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
+    ; Default is VeryLow
+    OSFunctionThreatLevel = VeryLow
 
     ; Maximum number of items in load/unload queue before we start rejecting loads
     ; Note that we will only be rejecting load. Unloads will still be able to queue.
@@ -977,4 +980,4 @@ InterregionComms = "RESTComms"
     ; to format substitution:
     ; {0} is replaced with the region's name
     ; {1} is replaced with the region's UUID
-    broker = "http://broker.place.com/{1}"
\ No newline at end of file
+    broker = "http://broker.place.com/{1}"