Ensure XPath for ConfigDaemon matches exactly one element (#1224)

froxlor · Jan 13, 2024 · 854c930 · 854c930
1 parent 8740947
commit 854c930
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Froxlor/Config/ConfigDaemon.php b/lib/Froxlor/Config/ConfigDaemon.php
@@ -91,6 +91,9 @@ public function __construct($xml, $xpath)
 		$this->fullxml = $xml;
 		$this->xpath = $xpath;
 		$this->daemon = $this->fullxml->xpath($this->xpath);
+		if (count($this->daemon) !== 1) {
+			throw new Exception('XPath "' . $this->xpath . '" didn\'t return exactly one element');
+		}
 		$attributes = $this->daemon[0]->attributes();
 		if ($attributes['title'] != '') {
 			$this->title = $this->parseContent((string)$attributes['title']);

diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
@@ -1702,7 +1702,7 @@ dovecot	  unix	-	n	n	-	-	pipe
 					</include>
 				</daemon>
 				<!-- postfix with dovecot -->
-				<daemon name="postfix_dovecot"
+				<daemon name="postfix_dovecot" version="3"
 					title="Postfix 3 with dovecot" default="true">
 					<include>//service[@type='smtp']/general/commands[@index=1]
 					</include>