From 98131232affc3d1dad47fc99e3430d9b0a783ddd Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 20 Jul 2009 05:22:17 +0000
Subject: [PATCH] Detect invalid Webmin server object

---
 web-lib-funcs.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 4319cab20..f3d464e09 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -5419,12 +5419,13 @@ and is called by the other remote_* functions.
 sub remote_rpc_call
 {
 my $serv;
-my $sn = &remote_session_name($_[0]);
+my $sn = &remote_session_name($_[0]);	# Will be undef for local connection
 if (ref($_[0])) {
 	# Server structure was given
 	$serv = $_[0];
-	$serv->{'user'} || !$sn || return &$main::remote_error_handler(
-					"No login set for server");
+	$serv->{'user'} || $serv->{'id'} == 0 ||
+		return &$main::remote_error_handler(
+			"No Webmin login set for server");
 	}
 elsif ($_[0]) {
 	# lookup the server in the webmin servers module if needed