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

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

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2755 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  b400c58f5a6f1cf1f3be4e7976c0e98ba4fd50af (commit)
       via  8e1259a31b148fce90ba56f8e4c3ca3e05b35bc1 (commit)
       via  6f7bbb38c9460e1f179f064d9e0a0b2cf4bf45da (commit)
       via  d56df86ce26d5c35a89ffde492a0eb708396ee7e (commit)
       via  375d1dc6dd46783900b9eb2f4fb3e3e25e7e0778 (commit)
       via  5474f9b32ffb2c41c89e30560919854584ed8169 (commit)
       via  b165dcdd803ba278013b1af03a8269f8994cb5f7 (commit)
       via  03a71cd52131be601e2fc5101e3425e82e654ec9 (commit)
       via  69bb956729ffc7268a40400cb1e01335ab919ea9 (commit)
       via  ff599dd2cb0d0cb9cac7019f1970b4d516bb2c36 (commit)
       via  5cee03da1e29e6cde5d4fe121b22b86768006775 (commit)
      from  0a8cfdac43dd8d782ae99020e442d39eefaf3896 (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 b400c58f5a6f1cf1f3be4e7976c0e98ba4fd50af
Merge: 0a8cfdac43 8e1259a31b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Oct 8 08:48:14 2024 +0000

    Merge branch 'master' into next

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

Summary of changes:
 config/rootfiles/oldcore/189/filelists/files | 1 +
 html/cgi-bin/wlanap.cgi                      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/oldcore/189/filelists/files b/config/rootfiles/oldcore/189/filelists/files
index 7e7959886..1603622e7 100644
--- a/config/rootfiles/oldcore/189/filelists/files
+++ b/config/rootfiles/oldcore/189/filelists/files
@@ -8,6 +8,7 @@ srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/html/include/rrdimage.js
 usr/bin/suricata-watcher
+usr/lib/firewall/rules.pl
 var/ipfire/graphs.pl
 var/ipfire/header.pl
 var/ipfire/ids-functions.pl
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 3226c5893..83849d324 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -61,7 +61,7 @@ my %cgiparams = ();
 &Header::getcgihash(\%cgiparams);
 
 # Find the selected interface
-my $INTF = &Network::get_intf_by_address($wlanapsettings{'INTERFACE'});
+my $INTF = &Network::get_intf_by_address($cgiparams{'INTERFACE'});
 
 delete $wlanapsettings{'__CGI__'};
 delete $wlanapsettings{'x'};


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