New/changed macros by Tuomo Soini

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4575 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/compiler

@@ -2888,7 +2888,9 @@ process_default_macro() # $1 = macro name
 #
 #    src dst protocol sport dport tos
 #
-# and has loaded a space-separated list of their values in "rule".
+# and has loaded a space-separated list of their values in "rule". The caller
+# has also set the variable 'chain' to contain the name of the mangle table
+# chain where forward rules are to be in placed in.
 #
 process_tos_rule() {
     #

Shorewall/lib.config

@@ -194,7 +194,7 @@ expandv() # $* = list of variable names
 }
 
 #
-# Add whitespace after "!"
+# Add whitespace after leading "!"
 #
 fix_bang()
 {

Shorewall/macro.Finger

@@ -0,0 +1,13 @@
+#
+# Shorewall version 3.2 - Finger Macro
+#
+# /usr/share/shorewall/macro.Finger
+#
+#	This macro handles Finger protocol. You should not generally open
+#	your finger information to internet.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGINAL	RATE	USER/
+#				PORT	PORT(S)	DEST		LIMIT	GROUP
+PARAM	-	-	tcp	79
+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE

Shorewall/macro.Rdate

@@ -6,6 +6,8 @@
 #	This macro handles remote time retrieval (rdate).
 #	Unless you are supporting extremely old hardware or software,
 #	you shouldn't be using this.  NTP is a superior alternative.
+#	And even if you need to use rfc 868 Time protocol you should
+#	use Time macro instead.
 #
 ###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGINAL	RATE	USER/

Shorewall/macro.Telnets

@@ -0,0 +1,13 @@
+#
+# Shorewall version 3.2 - Telnet Macro
+#
+# /usr/share/shorewall/macro.Telnets
+#
+#	This macro handles Telnets (Telnet over SSL) traffic.
+#	For traffic over the internet, SSH might be more practical.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	ORIGINAL	RATE	USER/
+#				PORT	PORT(S)	DEST		LIMIT	GROUP
+PARAM	-	-	tcp	992
+#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE

Shorewall/shorewall.spec

@@ -136,6 +136,7 @@ fi
 %attr(0644,root,root) /usr/share/shorewall/macro.DropDNSrep
 %attr(0644,root,root) /usr/share/shorewall/macro.DropUPnP
 %attr(0644,root,root) /usr/share/shorewall/macro.Edonkey
+%attr(0644,root,root) /usr/share/shorewall/macro.Finger
 %attr(0644,root,root) /usr/share/shorewall/macro.FTP
 %attr(0644,root,root) /usr/share/shorewall/macro.Gnutella
 %attr(0644,root,root) /usr/share/shorewall/macro.HTTP
@@ -170,6 +171,8 @@ fi
 %attr(0644,root,root) /usr/share/shorewall/macro.SVN
 %attr(0644,root,root) /usr/share/shorewall/macro.Syslog
 %attr(0644,root,root) /usr/share/shorewall/macro.Telnet
+%attr(0644,root,root) /usr/share/shorewall/macro.Telnets
+%attr(0644,root,root) /usr/share/shorewall/macro.Time
 %attr(0644,root,root) /usr/share/shorewall/macro.template
 %attr(0644,root,root) /usr/share/shorewall/macro.Trcrt
 %attr(0644,root,root) /usr/share/shorewall/macro.VNC