From 52d2e6227430d0bd7d8cba6e1bb4490d63b91e9e Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 22 Dec 2014 08:36:34 -0800 Subject: [PATCH] Convert two macros to Format 2 Signed-off-by: Tom Eastep --- Shorewall/Macros/macro.ActiveDir | 8 +++++--- Shorewall/Macros/macro.Goto-Meeting | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Shorewall/Macros/macro.ActiveDir b/Shorewall/Macros/macro.ActiveDir index 625c44e70..8c60fceb8 100644 --- a/Shorewall/Macros/macro.ActiveDir +++ b/Shorewall/Macros/macro.ActiveDir @@ -7,10 +7,12 @@ # # You can comment out the ports you do not want open # -# +# ############################################################################### -#ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ -# PORT(S) PORT(S) LIMIT GROUP +?FORMAT 2 +############################################################################### +#ACTION SOURCE DEST PROTO DEST SOURCE ORIGIN RATE USER/ +# PORT(S) PORT(S) DEST LIMIT GROUP PARAM - - tcp 389 #LDAP services PARAM - - udp 389 PARAM - - tcp 636 #LDAP SSL diff --git a/Shorewall/Macros/macro.Goto-Meeting b/Shorewall/Macros/macro.Goto-Meeting index 7af60b71f..a5976d588 100644 --- a/Shorewall/Macros/macro.Goto-Meeting +++ b/Shorewall/Macros/macro.Goto-Meeting @@ -7,6 +7,8 @@ # Assumes that ports 80 and 443 are already open # If needed, use the macros that open Http and Https to reduce redundancy #################################################################################### -#ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ -# PORT(S) PORT(S) LIMIT GROUP -PARAM - - tcp 8200 # Goto Meeting only needed (TCP outbound) +?FORMAT 2 +#################################################################################### +#ACTION SOURCE DEST PROTO DEST SOURCE ORIGIN RATE USER/ +# PORT(S) PORT(S) DEST LIMIT GROUP +PARAM - - tcp 8200 # Goto Meeting only needed (TCP outbound)