fix some more niffnaffs for cc cluster

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index f6347fd9b86b67df6a71664a1a93c59ddad9c27f..22f0d376064ebc5f82cbfb243eb245ebd456d89b 100644 (file)
--- 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 116b69e62eebec01552ec5bb2a9c47066d9d4f61..955426fa4104e9bb48663a9a47205d3297d0419f 100644 (file)
--- 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;