From: djk <djk>
Date: Mon, 21 Dec 1998 12:10:09 +0000 (+0000)
Subject: 1. Added "issue" to the client program for 'login' connections
X-Git-Tag: R_1_13~2
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=c66d28ace3e5bf4b9fa20256425d7d1416e7d8c5;p=spider.git

1. Added "issue" to the client program for 'login' connections
2. Added more docs for client program.
3. Fixed problem introduced in 1.12 where a connect locally with a callsign of
someone connected remotely would stop the cluster.
4. issue release 1.13
---

diff --git a/Changes b/Changes
index d74a7b85..c8f8ee15 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+21Dec98========================================================================
+1. Added "issue" to the client program for 'login' connections
+2. Added more docs for client program.
+3. Fixed problem introduced in 1.12 where a connect locally with a callsign of
+someone connected remotely would stop the cluster.
+4. issue release 1.13
 20Dec98========================================================================
 1. Removed all the warnings I get with perl -w (at least for just starting the
 cluster and running a few commands).
diff --git a/perl/cluster.pl b/perl/cluster.pl
index b7bdd037..16a03037 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -89,19 +89,17 @@ sub rec
 		# is there one already connected elsewhere in the cluster (and not a cluster)
 		my $user = DXUser->get($call);
 		if ($user) {
-			if ($user->sort eq 'A' && !DXCluster->get_exact($call)) {
-				;
-			} elsif ($user->sort eq 'U' && $call eq $main::myalias && !DXCluster->get_exact($call)) {
+			if (($user->sort eq 'A' || $call == $myalias) && !DXCluster->get_exact($call)) {
 				;
 			} else {
-				if (DXChannel->get($call)) {
+				if (DXCluster->get($call) || DXChannel->get($call)) {
 					my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
 					already_conn($conn, $call, $mess);
 					return;
 				}
 			}
 		} else {
-			if (DXChannel->get($call)) {
+			if (DXCluster->get($call) || DXChannel->get($call)) {
 				my $mess = DXM::msg($lang, 'conother', $call);
 				already_conn($conn, $call, $mess);
 				return;