Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
2db9f6a7
Commit
2db9f6a7
authored
May 20, 2015
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:opnsense/core
parents
4a589ec8
ae1b610c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
10 deletions
+6
-10
captiveportal.inc
src/etc/inc/captiveportal.inc
+3
-4
configd.conf
src/opnsense/service/conf/configd.conf
+1
-3
ipfw.conf
src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
+1
-1
system_groupmanager.php
src/www/system_groupmanager.php
+1
-2
No files found.
src/etc/inc/captiveportal.inc
View file @
2db9f6a7
...
...
@@ -213,7 +213,6 @@ 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
);
...
...
src/opnsense/service/conf/configd.conf
View file @
2db9f6a7
...
...
@@ -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
src/opnsense/service/templates/OPNsense/IPFW/ipfw.conf
View file @
2db9f6a7
src/www/system_groupmanager.php
View file @
2db9f6a7
...
...
@@ -129,7 +129,6 @@ if (isset($_POST['save'])) {
}
}
if
(
!
$input_errors
)
{
$group
=
array
();
if
(
isset
(
$id
)
&&
$a_group
[
$id
])
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment