Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2019-06-15 18:09:06 +02:00

View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team info@ipfire.org #
# Copyright (C) 2007-2019 IPFire Team info@ipfire.org #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -3338,7 +3338,7 @@ sub make_algos($$$$$) {
push(@algo, $int);
}
if ($pfs || $grp eq "none") {
if ($pfs || $grp eq "none") {
# noop
} elsif ($grp =~ m/^e(.*)$/) {
push(@algo, "ecp$1");