From 872de4e07609d8dae7660e467a73fc6f4061956a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 16 Jun 2016 16:14:42 +0200
Subject: [locations] Handle machine UUID param to determine location

---
 modules-available/locations/baseconfig/getconfig.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules-available/locations/baseconfig')

diff --git a/modules-available/locations/baseconfig/getconfig.inc.php b/modules-available/locations/baseconfig/getconfig.inc.php
index 2cf5495d..3a0c918f 100644
--- a/modules-available/locations/baseconfig/getconfig.inc.php
+++ b/modules-available/locations/baseconfig/getconfig.inc.php
@@ -8,11 +8,11 @@ if (Request::any('force', 0, 'int') === 1 && Request::any('module', false, 'stri
 		$locationId = Request::any('value', 0, 'int');
 	}
 }
-// TODO: machine specific mapping
+
 if ($locationId === false) {
-	// Fallback to subnets
-	$locationId = Location::getFromIp($ip);
+	$locationId = Location::getFromIpAndUuid($ip, $uuid);
 }
+
 $matchingLocations = array();
 if ($locationId !== false) {
 	// Get all parents
-- 
cgit v1.2.3-55-g7522