From 9cd15bf349c86fe72b80664f8bd1268b872f72c4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 15 Aug 2016 15:14:23 +0200
Subject: [locations] Fix wrong overlap function for subnet collision detection

---
 modules-available/locations/inc/location.inc.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules-available/locations/inc/location.inc.php')

diff --git a/modules-available/locations/inc/location.inc.php b/modules-available/locations/inc/location.inc.php
index a018208d..71a621db 100644
--- a/modules-available/locations/inc/location.inc.php
+++ b/modules-available/locations/inc/location.inc.php
@@ -362,8 +362,7 @@ class Location
 
 	private static function overlap($net1, $net2)
 	{
-		return ($net1['startaddr'] >= $net2['startaddr'] && $net1['startaddr'] <= $net2['endaddr'])
-		|| ($net1['endaddr'] >= $net2['startaddr'] && $net1['endaddr'] <= $net2['endaddr']);
+		return ($net1['startaddr'] <= $net2['endaddr'] && $net1['endaddr'] >= $net2['startaddr']);
 	}
 
 }
-- 
cgit v1.2.3-55-g7522