lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 08:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:opnsense/core

Browse Source
This commit is contained in:
Ad Schellevis 2015-05-20 06:16:09 +00:00
commit 2db9f6a7f1
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/etc/inc/captiveportal.inc
View File

@ -213,8 +213,7 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
$message = 0;
include("/var/etc/captiveportal-{$cpzone}-logout.html");
}
}
return $sessionid;
}
@ -224,8 +223,8 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
//
/* reinit will disconnect all users, be careful! */
function captiveportal_init_rules($reinit = false) {
function captiveportal_init_rules($reinit = false)
{
$cpc = new OPNsense\CaptivePortal\CPClient();
$cpc->reconfigure();
unset($cpc);

4
src/opnsense/service/conf/configd.conf
View File

@ -3,7 +3,5 @@ socket_filename:/var/run/configd.socket
pid_filename:/var/run/configd.pid
[environment]
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/root/bin
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
HOME=/
USER=root
SHELL=/usr/local/etc/rc.initial

2
src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
View File

@ -118,7 +118,7 @@ add 30000 set 0 count ip from any to any
#======================================================================================
# traffic shaping section, authorized traffic
# traffic shaping section, authorized traffic
#======================================================================================
add 60000 return via any
add 65533 pass ip from any to any

3
src/www/system_groupmanager.php
View File

@ -120,7 +120,7 @@ if (isset($_POST['save'])) {
break;
}
}
$sys_groups = file_get_contents('/etc/group');
foreach (explode("\n",$sys_groups) as $line) {
if (explode(":",$line)[0] == $_POST['groupname'] ) {
@ -128,7 +128,6 @@ if (isset($_POST['save'])) {
}
}
}
if (!$input_errors) {
$group = array();