From: Alexander Marx <alexander.marx@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] BUG11805: Firewallrule with source orange and target firewall-interface-orange not possible
Date: Wed, 22 Aug 2018 11:23:16 +0200 [thread overview]
Message-ID: <20180822092316.25418-1-alexander.marx@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1556 bytes --]
From: Alexander Marx <amarx(a)ipfire.org>
Now its possible to create a rule with orange source and target orange interface of the firewall.
fixes: #11805
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
html/cgi-bin/firewall.cgi | 4 ----
lfs/apcupsd | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 499f279d1..fb1c25dfd 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -241,10 +241,6 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
$checkorange='on';
}
}
- #check useless rules
- if( ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange eq 'on') && $fwdfwsettings{'grp2'} eq 'ipfire'){
- $errormessage.=$Lang::tr{'fwdfw useless rule'}."<br>";
- }
#check if we try to break rules
if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){
$errormessage=$Lang::tr{'fwdfw err same'};
diff --git a/lfs/apcupsd b/lfs/apcupsd
index ce36c3c6f..773dace74 100644
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --enable-usb --enable-cgi \
- --with-cgi-bin=/srv/web/ipfire/cgi-bin
+ --with-cgi-bin=/srv/web/ipfire/cgi-bin --sysconfdir=/var/ipfire/ups
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
--
2.17.1
next reply other threads:[~2018-08-22 9:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-22 9:23 Alexander Marx [this message]
2018-08-22 10:14 ` Michael Tremer
2018-08-22 12:24 ` Alexander Marx
2018-08-22 13:45 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180822092316.25418-1-alexander.marx@ipfire.org \
--to=alexander.marx@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox