diff options
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs | 53 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 11 |
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 | |||
128 | 128 | ||
129 | switch (header[156]) | 129 | switch (header[156]) |
130 | { | 130 | { |
131 | case 0: | 131 | case 0: |
132 | tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE; | 132 | tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE; |
133 | break; | ||
134 | case (byte)'0': | ||
135 | tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE; | ||
136 | break; | ||
137 | case (byte)'1': | ||
138 | tarHeader.EntryType = TarEntryType.TYPE_HARD_LINK; | ||
139 | break; | ||
140 | case (byte)'2': | ||
141 | tarHeader.EntryType = TarEntryType.TYPE_SYMBOLIC_LINK; | ||
142 | break; | ||
143 | case (byte)'3': | ||
144 | tarHeader.EntryType = TarEntryType.TYPE_CHAR_SPECIAL; | ||
145 | break; | ||
146 | case (byte)'4': | ||
147 | tarHeader.EntryType = TarEntryType.TYPE_BLOCK_SPECIAL; | ||
148 | break; | ||
149 | case (byte)'5': | ||
150 | tarHeader.EntryType = TarEntryType.TYPE_DIRECTORY; | ||
151 | break; | ||
152 | case (byte)'6': | ||
153 | tarHeader.EntryType = TarEntryType.TYPE_FIFO; | ||
154 | break; | ||
155 | case (byte)'7': | ||
156 | tarHeader.EntryType = TarEntryType.TYPE_CONTIGUOUS_FILE; | ||
133 | break; | 157 | break; |
134 | case (byte)'0': | ||
135 | tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE; | ||
136 | break; | ||
137 | case (byte)'1': | ||
138 | tarHeader.EntryType = TarEntryType.TYPE_HARD_LINK; | ||
139 | break; | ||
140 | case (byte)'2': | ||
141 | tarHeader.EntryType = TarEntryType.TYPE_SYMBOLIC_LINK; | ||
142 | break; | ||
143 | case (byte)'3': | ||
144 | tarHeader.EntryType = TarEntryType.TYPE_CHAR_SPECIAL; | ||
145 | break; | ||
146 | case (byte)'4': | ||
147 | tarHeader.EntryType = TarEntryType.TYPE_BLOCK_SPECIAL; | ||
148 | break; | ||
149 | case (byte)'5': | ||
150 | tarHeader.EntryType = TarEntryType.TYPE_DIRECTORY; | ||
151 | break; | ||
152 | case (byte)'6': | ||
153 | tarHeader.EntryType = TarEntryType.TYPE_FIFO; | ||
154 | break; | ||
155 | case (byte)'7': | ||
156 | tarHeader.EntryType = TarEntryType.TYPE_CONTIGUOUS_FILE; | ||
157 | break; | ||
158 | } | 158 | } |
159 | |||
159 | return tarHeader; | 160 | return tarHeader; |
160 | } | 161 | } |
161 | 162 | ||
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" | |||
696 | MaintenanceLoopTicks_Other=10 | 696 | MaintenanceLoopTicks_Other=10 |
697 | 697 | ||
698 | ; Allow the use of os* functions (some are dangerous) | 698 | ; Allow the use of os* functions (some are dangerous) |
699 | AllowOSFunctions = true | 699 | ; Default is false |
700 | AllowOSFunctions = false | ||
700 | 701 | ||
701 | ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe | 702 | ; Threat level to allow if os functions are enabled |
702 | OSFunctionThreatLevel = Low | 703 | ; One of None, VeryLow, Low, Moderate, High, VeryHigh, Severe |
704 | ; Default is VeryLow | ||
705 | OSFunctionThreatLevel = VeryLow | ||
703 | 706 | ||
704 | ; Maximum number of items in load/unload queue before we start rejecting loads | 707 | ; Maximum number of items in load/unload queue before we start rejecting loads |
705 | ; Note that we will only be rejecting load. Unloads will still be able to queue. | 708 | ; Note that we will only be rejecting load. Unloads will still be able to queue. |
@@ -977,4 +980,4 @@ InterregionComms = "RESTComms" | |||
977 | ; to format substitution: | 980 | ; to format substitution: |
978 | ; {0} is replaced with the region's name | 981 | ; {0} is replaced with the region's name |
979 | ; {1} is replaced with the region's UUID | 982 | ; {1} is replaced with the region's UUID |
980 | broker = "http://broker.place.com/{1}" \ No newline at end of file | 983 | broker = "http://broker.place.com/{1}" |