From e4e79982dd3c447a4ced762a6069db553e246f59 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 28 May 2014 18:18:34 +0200
Subject: Fixed some bugs from Sateserver v05

---
 inc/trigger.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/trigger.inc.php')

diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php
index 102f7987..b7cc67cc 100644
--- a/inc/trigger.inc.php
+++ b/inc/trigger.inc.php
@@ -39,7 +39,7 @@ class Trigger
 	
 	public static function ldadp()
 	{
-		$res = Database::simpleQuery("SELECT moduleid, filepath FROM configtgz_module"
+		$res = Database::simpleQuery("SELECT moduleid, configtgz.filepath FROM configtgz_module"
 			. " INNER JOIN configtgz_x_module USING (moduleid)"
 			. " INNER JOIN configtgz USING (configid)"
 			. " WHERE moduletype = 'AD_AUTH'");
@@ -65,7 +65,7 @@ class Trigger
 		if (!is_array($vmstore)) return;
 		$storetype = $vmstore['storetype'];
 		if ($storetype === 'nfs') $addr = $vmstore['nfsaddr'];
-		if ($storetype === 'cifs') $addr = $vmstore['nfsaddr'];
+		if ($storetype === 'cifs') $addr = $vmstore['cifsaddr'];
 		if ($storetype === 'internal') $addr = 'none';
 		$this->mountTask = Taskmanager::submit('MountVmStore', array(
 			'address' => $addr,
-- 
cgit v1.2.3-55-g7522