Bugfix the issue #1

olafrv · Mar 11, 2017 · 8e04340 · 8e04340
1 parent 9dfb75c
commit 8e04340
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/netdump.php b/netdump.php
@@ -284,6 +284,18 @@
 			logError("Undefined template variable(s): " . implode(",",$template_variables_undefined), $target, $logfile);
 			continue;
 		}
+		// Check finish in case or answers
+		if (count($_TEMPLATE[$template]["cases"])!=count($_TEMPLATE[$template]["answers"]))
+		{
+			logError("Cases and answers groups count differs in template '$template'", $target, $logfile);
+			continue;
+		}
+		if (is_null(tabget(end($_TEMPLATE[$template]["cases"]), 3,"finish")) &&
+				is_null(tabget(end($_TEMPLATE[$template]["answers"]), 3,"finish")))
+		{
+			logError("Last cases or answers group must define a 'finish' action in 'template'", $target, $logfile);
+			continue;
+		}
 	}
 	else
 	{

diff --git a/templates/fortinet.fortios.novdom.php b/templates/fortinet.fortios.novdom.php
@@ -14,7 +14,7 @@
 			  array("sshpassword", "$auth[2]\n", 1)
 			,	array("prompt", "execute backup full-config ftp ftp/" . $target_tag . ".conf $auth[5] $auth[3] $auth[4]\n", 1)
 			, array("prompt", "end\n", 1)
-			, array("prompt", "exit\n", 1)
+			, array("prompt", "exit\n", 1, "finish")
 		)
 	)
 	, "pre-exec" => array(

diff --git a/templates/fortinet.fortios.php b/templates/fortinet.fortios.php
@@ -16,7 +16,7 @@
 			, array("prompt", "config global\n", 1)
 			,	array("prompt global", "execute backup full-config ftp ftp/" . $target_tag . ".conf $auth[5] $auth[3] $auth[4]\n", 1)
 			, array("prompt global", "end\n", 1)
-			, array("prompt", "exit\n", 1)
+			, array("prompt", "exit\n", 1, "finish")
 		)
 	)
 	, "pre-exec" => array(