Browse Source

correct erroneous logic in remap file when (by our default) using both secure chroot(8) mode, and supplying a remap rule for nonabolute paths, and also do some remap file whitespace cleanups

Michael Schloh von Bennewitz 21 years ago
parent
commit
b3f1bfbbdc
2 changed files with 7 additions and 7 deletions
  1. 1 1
      tftp/tftp.spec
  2. 6 6
      tftp/tftpd.remap

+ 1 - 1
tftp/tftp.spec

@@ -34,7 +34,7 @@ Class:        BASE
 Group:        Network
 License:      GPL
 Version:      0.40
-Release:      20041009
+Release:      20041119
 
 #   package options
 %option       with_fsl  yes

+ 6 - 6
tftp/tftpd.remap

@@ -24,10 +24,10 @@
 #
 # "#" begins a comment, unless \-escaped
 #
-ri	^[a-z]:					# Remove "drive letters"
-rg	\\		/			# Convert backslashes to slashes
-rg	\#		@			# Convert hash marks to @ signs
-rg	/../		/..no../		# Convert /../ to /..no../
+ri	^[a-z]:					# Remove drive letters
+rg	\\		/				# Convert backslashes to slashes
+rg	\#		@				# Convert hash marks to @ signs
+rg	/../		/..no../	# Convert /../ to /..no../
 e	^incoming/				# These are always ok
-r	^[^/]		@l_prefix@/pub/\0	# Convert non-absolute files
-a	^\.					# Reject requests for hidden files
+r	^[^/]		/\0			# Convert nonabsolute files
+a	^\.						# Reject requests for hidden files