Skip to content
Snippets Groups Projects
Commit df99cfd5 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch '6244-3-2-7-remote-api-login-fails-if-restricted-by-remote_ips' into 'develop'

Resolve "3.2.7: remote api login fails if restricted by remote_ips"

Closes #6244

See merge request !1534
parents a0c3cdab ae955620
No related branches found
No related tags found
1 merge request!1534Resolve "3.2.7: remote api login fails if restricted by remote_ips"
Pipeline #9701 passed
...@@ -196,9 +196,9 @@ class remoting { ...@@ -196,9 +196,9 @@ class remoting {
if(trim($remote_user['remote_ips']) == '') { if(trim($remote_user['remote_ips']) == '') {
$remote_allowed=true; $remote_allowed=true;
} else { } else {
$ip = inet_pton($_SERVER['REMOTE_ADDR']); $ip_bin = inet_pton($ip);
foreach($allowed_ips as $allowed) { foreach($allowed_ips as $allowed) {
if($ip == inet_pton(trim($allowed))) { if($ip_bin == inet_pton(trim($allowed))) {
$remote_allowed=true; $remote_allowed=true;
break; break;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment