OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.6.3-post-fixes
Justin Clarke Casey 2009-01-30 21:04:23 +00:00
parent c307e0e4a7
commit 951c08933a
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
View File

@ -128,34 +128,35 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
switch (header[156]) switch (header[156])
{ {
case 0: case 0:
tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE; 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; 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; return tarHeader;
} }

11
bin/OpenSim.ini.example
View File

@ -696,10 +696,13 @@ InterregionComms = "RESTComms"
MaintenanceLoopTicks_Other=10 MaintenanceLoopTicks_Other=10
; Allow the use of os* functions (some are dangerous) ; 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 ; Threat level to allow if os functions are enabled
OSFunctionThreatLevel = Low ; 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 ; 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. ; Note that we will only be rejecting load. Unloads will still be able to queue.
@ -977,4 +980,4 @@ InterregionComms = "RESTComms"
; to format substitution: ; to format substitution:
; {0} is replaced with the region's name ; {0} is replaced with the region's name
; {1} is replaced with the region's UUID ; {1} is replaced with the region's UUID
broker = "http://broker.place.com/{1}" broker = "http://broker.place.com/{1}"