From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 29 Jan 2025 14:54:17 +0000 (+0000)
Subject: fix some more niffnaffs for cc cluster
X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=27eff58cd809f010ea8540478b57b2a0285636b5;p=spider.git

fix some more niffnaffs for cc cluster
---

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index f6347fd9..22f0d376 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -2260,11 +2260,16 @@ sub handle_92
 					++$changed;
 				}
 
-				if ($oldsort ne 'S') {
+				unless ($user->is_spider || $user->is_ccluster) {
 					$user->sort('S');
 					dbg(sprintf "PCPROT: PC92 K rec, node $call updated sort: $oldsort->S");
 					++$changed;
 				}
+
+				if ($self->is_ccluster && $self->state ne 'normal') {
+					$self->state('normal');
+					dbg(sprintf "PCPROT: PC92 K rec, node $call updated state now 'normal'");
+				}
 				
 				unless (DXChannel::get($user->call)) { # only do this if not connected
 					my $oldpriv = $user->priv;
diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 116b69e6..955426fa 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -595,7 +595,7 @@ sub wantlogininfo
 sub is_node
 {
 	my $self = shift;
-	return $self->{sort} =~ /^[ACRSX]$/;
+	return $self->{sort} =~ /^[ACRSXL]$/;
 }
 
 sub is_local_node
@@ -658,6 +658,12 @@ sub is_rbn
 	return $self->{sort} eq 'N'
 }
 
+sub is_ccluster
+{
+	my $self = shift;
+	return $self->{sort} eq 'L'
+}
+
 sub unset_passwd
 {
 	my $self = shift;