[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b31d55a79d4c2771b36a209227da7cf99c8606a7

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b31d55a79d4c2771b36a209227da7cf99c8606a7

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3290 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  b31d55a79d4c2771b36a209227da7cf99c8606a7 (commit)
       via  2754623fa9842d80cdd8341f06536b0940f4aeea (commit)
      from  aec1925bea763d7dff55ed43d26bdb06acd2e07c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b31d55a79d4c2771b36a209227da7cf99c8606a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Aug 24 11:45:44 2018 +0100

    core124: Ship updated fwhosts.cgi
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 2754623fa9842d80cdd8341f06536b0940f4aeea
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Fri Aug 24 10:06:30 2018 +0200

    BUG11825: firewall: Renaming a network/host group doesn't update rules
    
    Code only changed field 6 of hash (target group) and not field 4 (source group).
    Also if using geoip it was only field 4 of hash (source group) and not field 6 of hash (target group)
    Added new code that changes both fields to reflect the change in the firewallrules immediately.
    
    fixes: #11825
    
    Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/124/filelists/files | 1 +
 html/cgi-bin/fwhosts.cgi                  | 2 ++
 2 files changed, 3 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files
index eeb9048d9..7093d0de8 100644
--- a/config/rootfiles/core/124/filelists/files
+++ b/config/rootfiles/core/124/filelists/files
@@ -5,6 +5,7 @@ etc/rc.d/init.d/aws
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/partresize
 srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 576701ac6..7315e79b6 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1258,6 +1258,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegrpname')
 			}
 			&General::writehasharray("$configgrp", \%customgrp );
 			#change name in FW Rules
+			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4);
 			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6);
 		}
 	}
@@ -1282,6 +1283,7 @@ if ($fwhostsettings{'ACTION'} eq 'changegeoipgrpname')
 			&General::writehasharray("$configgeoipgrp", \%customgeoipgrp );
 			#change name in FW Rules
 			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},4,"geoip");
+			&changenameinfw($fwhostsettings{'oldgrpname'},$fwhostsettings{'grp'},6,"geoip");
 		}
 	}
 	&addgeoipgrp;


hooks/post-receive
--
IPFire 2.x development tree