Merge pull request ITRS-Group#8 in SYSTEM-ADDONS/plugins-op5-check_vmware_api from bugfix/MON-9527-revert-commit to master

Carl Helmertz · Carl Helmertz · commit 0451443e185f · 2016-08-23T11:14:26.000+02:00
* commit '1f4767e46e7b916072a4efbee201edbd735a0f81':
  Revert "Session cookies will be used for loading and reusing sessions and not only for faster authentication."
diff --git a/check_vmware_api.pl b/check_vmware_api.pl
@@ -618,14 +618,13 @@ sub main {
 		if (defined($sessionfile) and -e $sessionfile)
 		{
 			Opts::set_option("sessionfile", $sessionfile);
-			Vim::load_session(service_url => $host_address, session_file => $sessionfile);
 			eval {
-				Util::connect();
+				Util::connect($host_address, $username, $password);
 				die "Connected host doesn't match reqested once\n" if (Opts::get_option("url") ne $host_address);
 			};
 			if ($@) {
 				Opts::set_option("sessionfile", undef);
-				Util::connect();
+				Util::connect($host_address, $username, $password);
 			}
 		}
 		else

Original file line number	Diff line number	Diff line change
`@@ -618,14 +618,13 @@ sub main {`
`618`	`618`	`if (defined($sessionfile) and -e $sessionfile)`
`619`	`619`	`{`
`620`	`620`	`Opts::set_option("sessionfile", $sessionfile);`
`621`		`- Vim::load_session(service_url => $host_address, session_file => $sessionfile);`
`622`	`621`	`eval {`
`623`		`- Util::connect();`
	`622`	`+ Util::connect($host_address, $username, $password);`
`624`	`623`	`die "Connected host doesn't match reqested once\n" if (Opts::get_option("url") ne $host_address);`
`625`	`624`	`};`
`626`	`625`	`if ($@) {`
`627`	`626`	`Opts::set_option("sessionfile", undef);`
`628`		`- Util::connect();`
	`627`	`+ Util::connect($host_address, $username, $password);`
`629`	`628`	`}`
`630`	`629`	`}`
`631`	`630`	`else`